[Commits] e1ffb66449e: Merge tag 'mariadb-10.0.35' into 10.0-galera

7 May 2018

--- a/debian/control
+++ b/debian/control
@@@ -24,31 -24,257 +24,31 @@@ Build-Depends: bison
                 ${LIBREADLINE_DEV}
  Standards-Version: 3.8.3
  Homepage: http://mariadb.org/
- Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.0/files
- Vcs-Bzr: bzr://lp:maria
+ Vcs-Browser: https://github.com/MariaDB/server/
+ Vcs-Git: https://github.com/MariaDB/server.git
  
 -Package: libmariadbclient18
 -Section: libs
 -Architecture: any
 -Depends: libmysqlclient18 (= ${source:Version}),
 -         mariadb-common (>= ${source:Version}),
 -         ${misc:Depends},
 -         ${shlibs:Depends}
 -Conflicts: mariadb-galera-server-10.0 (<< 10.0.5),
 -           mariadb-galera-server-5.5 (<< 5.5.33),
 -           mariadb-server-10.0 (<< 10.0.5),
 -           mariadb-server-5.1,
 -           mariadb-server-5.2,
 -           mariadb-server-5.3,
 -           mariadb-server-5.5 (<< 5.5.33)
 -Description: MariaDB database client library
 - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
 - server. SQL (Structured Query Language) is the most popular database query
 - language in the world. The main goals of MariaDB are speed, robustness and
 - ease of use.
 - .
 - This package includes the client library.
 -
 -Package: libmysqlclient18
 -Section: libs
 -Architecture: any
 -Depends: libmariadbclient18 (= ${source:Version})
 -Replaces: libmysqlclient18 (<< ${source:Version})
 -Description: Virtual package to satisfy external depends
 - This is an empty package that provides an updated "best" version of
 - libmysqlclient18 that does not conflict with the libmariadbclient18
 - package.
 - .
 - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
 - server. SQL (Structured Query Language) is the most popular database query
 - language in the world. The main goals of MariaDB are speed, robustness and
 - ease of use.
 -
 -Package: libmariadbd-dev
 -Architecture: any
 -Section: libdevel
 -Depends: libmariadbclient-dev (>= ${source:Version}), ${misc:Depends}
 -Provides: libmysqld-dev
 -Conflicts: libmysqld-dev
 -Replaces: libmysqld-dev
 -Description: MariaDB embedded database development files
 - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
 - server. SQL (Structured Query Language) is the most popular database query
 - language in the world. The main goals of MariaDB are speed, robustness and
 - ease of use.
 - .
 - This package includes the embedded server library and header files.
 -
 -Package: libmariadbclient-dev
 -Architecture: any
 -Section: libdevel
 -Depends: libmariadbclient18 (>= ${source:Version}),
 -         zlib1g-dev,
 -         ${misc:Depends},
 -         ${shlibs:Depends}
 -Replaces: libmariadbclient16-dev, libmysqlclient16-dev
 -Conflicts: libmariadbclient16-dev,
 -           libmysqlclient-dev,
 -           libmysqlclient10-dev,
 -           libmysqlclient12-dev,
 -           libmysqlclient14-dev,
 -           libmysqlclient15-dev,
 -           libmysqlclient16-dev
 -Provides: libmysqlclient-dev
 -Description: MariaDB database development files
 - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
 - server. SQL (Structured Query Language) is the most popular database query
 - language in the world. The main goals of MariaDB are speed, robustness and
 - ease of use.
 - .
 - This package includes development libraries and header files.
 -
 -Package: mysql-common
 -Section: database
 -Architecture: all
 -Depends: ${misc:Depends}, ${shlibs:Depends}
 -Description: MariaDB database common files (e.g. /etc/mysql/my.cnf)
 - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
 - server. SQL (Structured Query Language) is the most popular database query
 - language in the world. The main goals of MariaDB are speed, robustness and
 - ease of use.
 - .
 - This package includes files needed by all versions of the client library
 - (e.g. /etc/mysql/my.cnf).
 -
 -Package: mariadb-common
 -Section: database
 -Architecture: all
 -Depends: mysql-common (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 -Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
 - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
 - server. SQL (Structured Query Language) is the most popular database query
 - language in the world. The main goals of MariaDB are speed, robustness and
 - ease of use.
 - .
 - This package includes files needed by all versions of the client library
 - (e.g. /etc/mysql/conf.d/mariadb.cnf).
 -
 -Package: mariadb-client-core-10.0
 -Architecture: any
 -Depends: libmariadbclient18 (>= ${source:Version}),
 -         mariadb-common (>= ${source:Version}),
 -         ${misc:Depends},
 -         ${shlibs:Depends}
 -Provides: mysql-client-core,
 -          mysql-client-core-5.1,
 -          mysql-client-core-5.5,
 -          mysql-client-core-5.6
 -Conflicts: mariadb-client-5.1,
 -           mariadb-client-5.2,
 -           mariadb-client-5.3,
 -           mariadb-client-5.5,
 -           mariadb-client-core-5.1,
 -           mariadb-client-core-5.2,
 -           mariadb-client-core-5.3,
 -           mariadb-client-core-5.5,
 -           mysql-client (<< 5.0.51),
 -           mysql-client-5.0,
 -           mysql-client-5.1 (<< ${source:Version}),
 -           mysql-client-5.5 (<< ${source:Version}),
 -           mysql-client-core-5.1,
 -           mysql-client-core-5.5,
 -           mysql-client-core-5.6
 -Replaces: mariadb-client-5.1,
 -          mariadb-client-5.2,
 -          mariadb-client-5.3,
 -          mariadb-client-5.5,
 -          mariadb-client-core-5.1,
 -          mariadb-client-core-5.2,
 -          mariadb-client-core-5.3,
 -          mariadb-client-core-5.5,
 -          mysql-client (<< 5.0.51),
 -          mysql-client-5.0,
 -          mysql-client-5.1,
 -          mysql-client-5.5,
 -          mysql-client-core-5.1,
 -          mysql-client-core-5.5,
 -          mysql-client-core-5.6
 -Description: MariaDB database core client binaries
 - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
 - server. SQL (Structured Query Language) is the most popular database query
 - language in the world. The main goals of MariaDB are speed, robustness and
 - ease of use.
 - .
 - This package includes the core client files, as used by Akonadi.
 -
 -Package: mariadb-client-10.0
 -Architecture: any
 -Depends: debianutils (>=1.6),
 -         libdbd-mysql-perl (>= 1.2202),
 -         libdbi-perl,
 -         libmariadbclient18 (>= ${source:Version}),
 -         mariadb-client-core-10.0 (>= ${source:Version}),
 -         mariadb-common (>= ${source:Version}),
 -         ${misc:Depends},
 -         ${perl:Depends},
 -         ${shlibs:Depends}
 -Suggests: libterm-readkey-perl
 -Provides: mysql-client,
 -          mysql-client-4.1,
 -          mysql-client-5.1,
 -          mysql-client-5.5,
 -          mysql-client-5.6,
 -          virtual-mysql-client
 -Conflicts: mariadb-client (<< ${source:Version}),
 -           mariadb-client-5.1,
 -           mariadb-client-5.2,
 -           mariadb-client-5.3,
 -           mariadb-client-5.5,
 -           mysql-client (<< 5.0.51),
 -           mysql-client-5.0,
 -           mysql-client-5.1,
 -           mysql-client-5.5,
 -           mysql-client-5.6
 -Replaces: mariadb-client (<< ${source:Version}),
 -          mariadb-client-5.1,
 -          mariadb-client-5.2,
 -          mariadb-client-5.3,
 -          mariadb-client-5.5,
 -          mysql-client (<< 5.0.51),
 -          mysql-client-5.0,
 -          mysql-client-5.1,
 -          mysql-client-5.5,
 -          mysql-client-5.6
 -Description: MariaDB database client binaries
 - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
 - server. SQL (Structured Query Language) is the most popular database query
 - language in the world. The main goals of MariaDB are speed, robustness and
 - ease of use.
 - .
 - This package includes the client binaries and the additional tools
 - innotop and mysqlreport.
 -
 -Package: mariadb-server-core-10.0
 -Architecture: any
 -Depends: libmariadbclient18 (>= ${binary:Version}),
 -         ${misc:Depends},
 -         ${shlibs:Depends}
 -Provides: mysql-server-core,
 -          mysql-server-core-5.1,
 -          mysql-server-core-5.5,
 -          mysql-server-core-5.6
 -Conflicts: mariadb-server-core-5.1,
 -           mariadb-server-core-5.2,
 -           mariadb-server-core-5.3,
 -           mariadb-server-core-5.5,
 -           mysql-server-5.0,
 -           mysql-server-core-5.0,
 -           mysql-server-core-5.1,
 -           mysql-server-core-5.5,
 -           mysql-server-core-5.6
 -Replaces: mariadb-server-core-5.1,
 -          mariadb-server-core-5.2,
 -          mariadb-server-core-5.3,
 -          mariadb-server-core-5.5,
 -          mysql-server-5.0,
 -          mysql-server-core-5.0,
 -          mysql-server-core-5.1,
 -          mysql-server-core-5.5,
 -          mysql-server-core-5.6
 -Description: MariaDB database core server files
 - MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
 - server. SQL (Structured Query Language) is the most popular database query
 - language in the world. The main goals of MariaDB are speed, robustness and
 - ease of use.
 - .
 - This package includes the core server files, as used by Akonadi.
 -
 -Package: mariadb-test-10.0
 +Package: mariadb-galera-test-10.0
  Section: database
  Architecture: any
 -Depends: mariadb-client-10.0 (= ${source:Version}),
 -         mariadb-server-10.0 (= ${source:Version})
 +Depends: mariadb-galera-server-10.0 (= ${source:Version}),
 +         mariadb-client-10.0 (>= ${source:Version})
  Suggests: patch
 -Conflicts: mariadb-galera-server-5.5 (<< 5.5.33),
 -           mariadb-server-5.5 (<< 5.5.33),
 -           mariadb-test (<< ${source:Version}),
 +Conflicts: mariadb-test,
 +           mariadb-galera-test (<< ${source:Version}),
             mariadb-test-5.1,
             mariadb-test-5.2,
 -           mariadb-test-5.3
 +           mariadb-test-5.3,
 +           mariadb-test-5.5,
 +           mariadb-test-10.0,
 +           mariadb-server-5.5,
 +           mariadb-galera-server-5.5,
 +           mariadb-server-10.0
  Replaces: mariadb-test (<< ${source:Version}),
 +          mariadb-galera-test (<< ${source:Version}),
            mariadb-test-5.1,
            mariadb-test-5.2,
 -          mariadb-test-5.3
 +          mariadb-test-5.3,
 +          mariadb-test-5.5
  Description: MariaDB database regression test suite
   MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
   server. SQL (Structured Query Language) is the most popular database query
diff --cc mysql-test/suite/galera/disabled.def
index 78c3565b99d,00000000000..fad1e69d4d7
mode 100644,000000..100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@@ -1,51 -1,0 +1,53 @@@
 +##############################################################################
 +#
 +#  List the test cases that are to be disabled temporarily.
 +#
 +#  Separate the test case name and the comment with ':'.
 +#
 +#    <testcasename> : MDEV-<xxxx> <comment>
 +#
 +#  Do not use any TAB characters for whitespace.
 +#
 +##############################################################################
 +
 +MW-336 : MDEV-13549 Galera test failures
 +galera_gra_log : MDEV-13549 Galera test failures
 +galera_flush_local : MDEV-13549 Galera test failures
 +galera_flush :  MDEV-13549 Galera test failures
 +MW-329 : MDEV-13549 Galera test failures
 +galera_account_management : MariaDB 10.0 does not support ALTER USER
 +galera_binlog_row_image : MariaDB 10.0 does not support binlog_row_image
 +galera_binlog_rows_query_log_events: MariaDB does not support binlog_rows_query_log_events
 +GAL-419 : MDEV-13549 Galera test failures
 +galera_toi_ddl_fk_insert : MDEV-13549 Galera test failures
 +galera_var_notify_cmd : MDEV-13549 Galera test failures
 +galera_var_slave_threads : MDEV-13549 Galera test failures
 +mysql-wsrep#90 : MDEV-13549 Galera test failures
 +galera_as_master_gtid : Requires MySQL GTID
 +galera_as_master_gtid_change_master : Requires MySQL GTID
 +galera_as_slave_replication_bundle : MDEV-13549 Galera test failures
 +galera_as_slave_preordered : wsrep-preordered feature not merged to MariaDB
 +galera_gcs_fragment : MDEV-13549 Galera test failures
 +galera_gcache_recover : MDEV-13549 Galera test failures
 +galera_gcache_recover_full_gcache : MDEV-13549 Galera test failures
 +galera_gcache_recover_manytrx : MDEV-13549 Galera test failures
 +galera_ist_mysqldump : MDEV-13549 Galera test failures
 +mysql-wsrep#31 :  MDEV-13549 Galera test failures
 +galera_migrate : MariaDB 10.0 does not support START SLAVE USER
 +galera_concurrent_ctas : MDEV-13549 Galera test failures
 +galera_bf_abort_for_update : MDEV-13549 Galera test failures
 +galera_wsrep_desync_wsrep_on : MDEV-13549 Galera test failures
 +galera_ssl_upgrade : MDEV-13549 Galera test failures
 +mysql-wsrep#33 : MDEV-13549 Galera test failures
 +galera_var_auto_inc_control_on : MDEV-13549 Galera test failures
 +MW-44 : MDEV-13549 Galera test failures
 +galera_var_retry_autocommit : MDEV-13549 Galera test failures
 +pxc-421 : MDEV-13549 Galera test failures
 +lp1376747-2 : MDEV-13549 Galera test failures
 +lp1376747 : MDEV-13549 Galera test failures
 +galera_toi_ddl_nonconflicting : MDEV-13549 Galera test failures
 +galera_parallel_simple : MDEV-13549 Galera test failures
 +galera_admin : MDEV-13549 Galera test failures
 +MW-416 : MDEV-13549 Galera test failures
++galera_wan : MDEV-13549 Galera test failures
++MW-388 : MDEV-13549 Galera test failures
diff --cc sql/handler.cc
index fc8bb53f35d,f38569a1458..128043a8d80
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@@ -4464,8 -4379,6 +4454,7 @@@ handler::ha_create_partitioning_metadat
    DBUG_ASSERT(m_lock_type == F_UNLCK ||
                (!old_name && strcmp(name, table_share->path.str)));
  
-   mark_trx_read_write();
 +
    return create_partitioning_metadata(name, old_name, action_flag);
  }
  
diff --cc sql/sql_truncate.cc
index 259f2ad78e3,75a0678928b..7fc5192e42d
--- a/sql/sql_truncate.cc
+++ b/sql/sql_truncate.cc
@@@ -574,6 -565,6 +574,5 @@@ bool Sql_cmd_truncate_table::execute(TH
  
    if (! (res= truncate_table(thd, first_table)))
      my_ok(thd);
 -
    DBUG_RETURN(res);
  }
-

    

jan

tags

participants (1)