revision-id: e1ffb66449efa44e99d51c2a01c51d1623342d62 (mariadb-galera-10.0.34-7-ge1ffb66449e) parent(s): 648cf7176cc95f697abd8b94e860c74768680298 42fac3241368ad72f8cfef2b8521269e6c173558 author: Jan Lindström committer: Jan Lindström timestamp: 2018-05-07 17:20:39 +0300 message: Merge tag 'mariadb-10.0.35' into 10.0-galera .gitattributes | 1 + CREDITS | 3 +- client/mysqltest.cc | 2 +- debian/control | 4 +- mysql-test/r/contributors.result | 3 +- mysql-test/r/dyncol.result | 10 + mysql-test/r/func_concat.result | 6 + mysql-test/r/func_misc.result | 14 +- mysql-test/r/func_str.result | 37 + mysql-test/r/func_time.result | 24 + mysql-test/r/having.result | 14 + mysql-test/r/mysqld--help.result | 2 + mysql-test/r/partition.result | 11 + mysql-test/r/perror.result | 2 +- mysql-test/r/ps.result | 2 +- mysql-test/r/sp-destruct.result | 6 + mysql-test/r/sp-innodb.result | 34 + mysql-test/r/statistics.result | 18 + mysql-test/r/subselect_sj.result | 26 + mysql-test/r/subselect_sj_jcl6.result | 26 + mysql-test/r/type_time_6065.result | 44 ++ mysql-test/r/update_innodb.result | 10 + mysql-test/r/xml.result | 12 + mysql-test/suite/galera/disabled.def | 2 + .../suite/innodb/r/innodb-alter-nullable.result | 4 + .../suite/innodb/r/innodb_bug11754376.result | 1 - .../suite/innodb/r/innodb_bug27216817.result | 24 + mysql-test/suite/innodb/r/innodb_bug56947.result | 1 - .../suite/innodb/r/innodb_corrupt_bit.result | 45 ++ mysql-test/suite/innodb/r/mvcc.result | 26 + .../innodb/r/read_only_recover_committed.result | 43 + mysql-test/suite/innodb/r/recovery_shutdown.result | 2 +- .../suite/innodb/t/innodb-alter-nullable.test | 5 + mysql-test/suite/innodb/t/innodb_bug11754376.test | 2 - mysql-test/suite/innodb/t/innodb_bug14147491.test | 3 - mysql-test/suite/innodb/t/innodb_bug56947.test | 1 - mysql-test/suite/innodb/t/innodb_corrupt_bit.test | 8 +- mysql-test/suite/innodb/t/log_file_size.test | 3 +- mysql-test/suite/innodb/t/mvcc.test | 52 ++ .../innodb/t/read_only_recover_committed.test | 68 ++ mysql-test/suite/innodb/t/recovery_shutdown.test | 6 +- .../r/innobase_drop_fts_index_table.result | 1 - .../innodb_fts/r/innodb_fts_misc_debug.result | 3 +- .../r/innodb_fts_result_cache_limit.result | 1 - .../t/innobase_drop_fts_index_table.test | 2 - .../suite/innodb_fts/t/innodb_fts_misc_debug.test | 3 +- .../t/innodb_fts_result_cache_limit.test | 2 - mysql-test/suite/parts/inc/part_alter_values.inc | 10 + .../suite/parts/r/partition_alter_innodb.result | 6 + .../suite/parts/r/partition_alter_maria.result | 6 + .../suite/parts/r/partition_alter_myisam.result | 6 + .../r/max_prepared_stmt_count_basic.result | 20 +- .../suite/sys_vars/r/table_open_cache_basic.result | 4 +- .../sys_vars/t/max_prepared_stmt_count_basic.test | 4 +- mysql-test/t/dyncol.test | 9 + mysql-test/t/func_concat.test | 6 + mysql-test/t/func_misc.test | 19 +- mysql-test/t/func_str.test | 36 + mysql-test/t/func_time.test | 16 + mysql-test/t/having.test | 18 + mysql-test/t/partition.test | 13 + mysql-test/t/sp-destruct.test | 10 + mysql-test/t/sp-innodb.test | 42 + mysql-test/t/statistics.test | 20 + mysql-test/t/subselect_sj.test | 30 + mysql-test/t/type_time_6065.test | 23 + mysql-test/t/update_innodb.test | 13 + mysql-test/t/xml.test | 9 + mysql-test/unstable-tests | 137 ++-- mysys/ma_dyncol.c | 2 +- mysys/my_default.c | 10 +- pcre/AUTHORS | 6 +- pcre/ChangeLog | 53 ++ pcre/INSTALL | 320 ++++---- pcre/LICENCE | 6 +- pcre/NEWS | 6 + pcre/NON-AUTOTOOLS-BUILD | 15 +- pcre/configure.ac | 26 +- pcre/doc/html/NON-AUTOTOOLS-BUILD.txt | 15 +- pcre/pcre.h.in | 8 +- pcre/pcre_compile.c | 2 +- pcre/pcre_dfa_exec.c | 4 +- pcre/pcre_exec.c | 8 +- pcre/pcre_jit_compile.c | 407 +++++++--- pcre/pcregrep.c | 55 +- pcre/pcreposix.c | 6 +- pcre/testdata/testinput2 | 8 + pcre/testdata/testinput5 | 6 + pcre/testdata/testoutput2 | 16 + pcre/testdata/testoutput5 | 8 + sql/contributors.h | 3 +- sql/field.cc | 7 + sql/handler.cc | 19 +- sql/handler.h | 2 +- sql/item.cc | 7 + sql/item.h | 1 + sql/item_cmpfunc.cc | 42 +- sql/item_func.cc | 1 + sql/item_func.h | 7 + sql/item_row.cc | 1 + sql/item_strfunc.cc | 184 ++--- sql/item_strfunc.h | 20 +- sql/item_subselect.cc | 5 +- sql/item_sum.cc | 3 + sql/item_xmlfunc.cc | 10 +- sql/item_xmlfunc.h | 1 + sql/log_event.cc | 34 + sql/log_event_old.cc | 7 + sql/mysqld.cc | 4 +- sql/mysqld.h | 2 +- sql/net_serv.cc | 4 +- sql/opt_subselect.cc | 24 +- sql/share/errmsg-utf8.txt | 4 +- sql/sql_admin.cc | 2 +- sql/sql_base.cc | 23 +- sql/sql_class.h | 2 +- sql/sql_parse.cc | 4 + sql/sql_partition.cc | 11 +- sql/sql_partition_admin.cc | 2 +- sql/sql_plugin.cc | 2 +- sql/sql_select.cc | 10 +- sql/sql_statistics.cc | 41 +- sql/sql_statistics.h | 1 + sql/sql_table.cc | 13 +- sql/sql_time.cc | 2 + sql/sql_trigger.cc | 2 +- sql/sql_truncate.cc | 3 +- sql/sys_vars.cc | 6 +- storage/connect/CMakeLists.txt | 9 +- storage/connect/Client.java | 27 +- storage/connect/JavaWrappers.jar | Bin 44053 -> 19192 bytes storage/connect/JdbcInterface.java | 54 +- storage/connect/PostgresqlInterface.java | 5 +- storage/connect/array.cpp | 22 +- storage/connect/blkfil.cpp | 8 +- storage/connect/block.h | 4 +- storage/connect/checklvl.h | 3 +- storage/connect/cmgoconn.cpp | 18 +- storage/connect/colblk.cpp | 9 +- storage/connect/connect.cc | 43 +- storage/connect/csort.cpp | 16 +- storage/connect/domdoc.cpp | 3 +- storage/connect/filamap.cpp | 32 +- storage/connect/filamdbf.cpp | 12 +- storage/connect/filamfix.cpp | 68 +- storage/connect/filamgz.cpp | 20 +- storage/connect/filamtxt.cpp | 71 +- storage/connect/filamvct.cpp | 162 ++-- storage/connect/filamzip.cpp | 8 +- storage/connect/filter.cpp | 36 +- storage/connect/fmdlex.c | 24 +- storage/connect/global.h | 11 +- storage/connect/ha_connect.cc | 332 ++++---- storage/connect/inihandl.cpp | 54 +- storage/connect/javaconn.cpp | 6 +- storage/connect/jdbconn.cpp | 365 ++++++--- storage/connect/jdbconn.h | 11 +- storage/connect/jmgfam.cpp | 2 +- storage/connect/jmgoconn.cpp | 14 +- storage/connect/json.cpp | 41 +- storage/connect/json.h | 8 +- storage/connect/jsonudf.cpp | 862 ++++++++++++++------- storage/connect/jsonudf.h | 4 + storage/connect/libdoc.cpp | 98 +-- storage/connect/macutil.cpp | 4 +- storage/connect/mongo.cpp | 4 +- storage/connect/mycat.cc | 34 +- storage/connect/myconn.cpp | 10 +- .../mysql-test/connect/r/jdbc_postgresql.result | 35 +- .../mysql-test/connect/r/json_java_2.result | 7 +- .../mysql-test/connect/r/json_java_3.result | 4 +- .../mysql-test/connect/r/json_mongo_c.result | 2 + .../connect/mysql-test/connect/r/json_udf.result | 10 +- .../mysql-test/connect/r/json_udf_bin.result | 3 +- .../connect/mysql-test/connect/r/mongo_c.result | 2 + .../mysql-test/connect/r/mongo_java_2.result | 4 +- .../mysql-test/connect/r/mongo_java_3.result | 4 +- .../connect/mysql-test/connect/r/tbl_thread.result | 6 +- storage/connect/mysql-test/connect/r/vcol.result | 29 + .../mysql-test/connect/std_data/JavaWrappers.jar | Bin 0 -> 19192 bytes .../connect/mysql-test/connect/std_data/Mongo2.jar | Bin 3461358 -> 623907 bytes .../connect/mysql-test/connect/std_data/Mongo3.jar | Bin 1705776 -> 1705776 bytes .../mysql-test/connect/t/jdbc_postgresql.test | 33 +- storage/connect/mysql-test/connect/t/jdbconn.inc | 7 +- storage/connect/mysql-test/connect/t/json_udf.test | 6 +- storage/connect/mysql-test/connect/t/mongo.inc | 4 +- .../connect/mysql-test/connect/t/mongo_test.inc | 8 +- .../connect/mysql-test/connect/t/tbl_thread.test | 6 +- storage/connect/mysql-test/connect/t/vcol.test | 31 + storage/connect/odbconn.cpp | 103 +-- storage/connect/plgdbsem.h | 3 +- storage/connect/plgdbutl.cpp | 143 ++-- storage/connect/plugutil.cpp | 30 +- storage/connect/preparse.h | 2 +- storage/connect/rcmsg.c | 7 +- storage/connect/rcmsg.h | 2 +- storage/connect/reldef.cpp | 16 +- storage/connect/tabcol.cpp | 8 +- storage/connect/tabdos.cpp | 59 +- storage/connect/tabdos.h | 1 + storage/connect/tabext.cpp | 6 +- storage/connect/tabfix.cpp | 8 +- storage/connect/tabfmt.cpp | 36 +- storage/connect/tabjdbc.cpp | 35 +- storage/connect/tabjdbc.h | 2 + storage/connect/tabjson.cpp | 597 +++++++------- storage/connect/tabjson.h | 44 +- storage/connect/table.cpp | 16 +- storage/connect/tabmac.cpp | 4 +- storage/connect/tabmul.cpp | 26 +- storage/connect/tabmysql.cpp | 28 +- storage/connect/tabodbc.cpp | 20 +- storage/connect/tabpivot.cpp | 2 +- storage/connect/tabsys.cpp | 12 +- storage/connect/tabtbl.cpp | 41 +- storage/connect/tabutil.cpp | 8 +- storage/connect/tabvct.cpp | 8 +- storage/connect/tabwmi.cpp | 4 +- storage/connect/tabxml.cpp | 26 +- storage/connect/user_connect.cc | 2 +- storage/connect/valblk.cpp | 2 +- storage/connect/value.cpp | 52 +- storage/connect/xindex.cpp | 88 +-- storage/connect/xobject.cpp | 5 +- storage/innobase/CMakeLists.txt | 4 +- storage/innobase/api/api0api.cc | 2 +- storage/innobase/btr/btr0cur.cc | 34 +- storage/innobase/btr/btr0pcur.cc | 2 +- storage/innobase/dict/dict0load.cc | 5 + storage/innobase/fts/fts0fts.cc | 29 +- storage/innobase/fts/fts0que.cc | 3 +- storage/innobase/handler/ha_innodb.cc | 2 +- storage/innobase/handler/handler0alter.cc | 63 +- storage/innobase/include/btr0cur.h | 12 +- storage/innobase/include/data0type.ic | 2 + storage/innobase/include/mtr0mtr.h | 16 +- storage/innobase/include/mtr0mtr.ic | 6 +- storage/innobase/include/row0upd.h | 4 +- storage/innobase/include/row0upd.ic | 4 +- storage/innobase/include/trx0undo.h | 13 +- storage/innobase/include/univ.i | 2 +- storage/innobase/lock/lock0lock.cc | 5 +- storage/innobase/mem/mem0mem.cc | 5 + storage/innobase/page/page0page.cc | 17 +- storage/innobase/row/row0ext.cc | 3 +- storage/innobase/row/row0ftsort.cc | 3 +- storage/innobase/row/row0import.cc | 9 +- storage/innobase/row/row0ins.cc | 24 +- storage/innobase/row/row0log.cc | 16 +- storage/innobase/row/row0merge.cc | 4 +- storage/innobase/row/row0mysql.cc | 16 +- storage/innobase/row/row0sel.cc | 19 +- storage/innobase/row/row0umod.cc | 14 +- storage/innobase/row/row0upd.cc | 12 +- storage/innobase/trx/trx0rec.cc | 8 +- storage/innobase/trx/trx0trx.cc | 4 +- storage/innobase/trx/trx0undo.cc | 16 +- storage/oqgraph/graphcore-config.h | 2 + storage/oqgraph/graphcore-graph.cc | 1 - storage/oqgraph/graphcore.cc | 1 - storage/oqgraph/oqgraph_shim.h | 5 +- storage/perfschema/ha_perfschema.cc | 2 +- storage/tokudb/CMakeLists.txt | 2 +- storage/tokudb/PerconaFT/.clang-format | 36 + storage/tokudb/PerconaFT/CMakeLists.txt | 6 + storage/tokudb/PerconaFT/README.md | 29 +- storage/tokudb/PerconaFT/ft/ft-ops.cc | 91 ++- storage/tokudb/PerconaFT/ft/tests/ft-clock-test.cc | 4 +- storage/tokudb/PerconaFT/ft/tests/log-test4.cc | 2 +- .../PerconaFT/portability/tests/test-max-data.cc | 2 +- .../PerconaFT/portability/toku_instrumentation.h | 2 + .../PerconaFT/portability/toku_portability.h | 2 +- .../tokudb/PerconaFT/portability/toku_pthread.h | 6 +- .../tokudb/PerconaFT/portability/toku_race_tools.h | 2 +- storage/tokudb/PerconaFT/portability/toku_time.h | 5 + .../PerconaFT/src/tests/checkpoint_stress.cc | 2 +- .../tokudb/PerconaFT/src/tests/directory_lock.cc | 2 +- .../PerconaFT/src/tests/loader-cleanup-test.cc | 18 +- .../src/tests/recover-del-multiple-abort.cc | 6 +- .../recover-del-multiple-srcdb-fdelete-all.cc | 6 +- .../PerconaFT/src/tests/recover-del-multiple.cc | 6 +- .../src/tests/recover-put-multiple-abort.cc | 6 +- .../PerconaFT/src/tests/recovery_fileops_unit.cc | 4 +- .../tokudb/PerconaFT/src/tests/test-prepare3.cc | 1 + storage/tokudb/hatoku_hton.cc | 20 +- storage/xtradb/CMakeLists.txt | 10 +- storage/xtradb/api/api0api.cc | 2 +- storage/xtradb/btr/btr0cur.cc | 41 +- storage/xtradb/btr/btr0pcur.cc | 2 +- storage/xtradb/dict/dict0dict.cc | 47 +- storage/xtradb/dict/dict0load.cc | 6 +- storage/xtradb/dict/dict0mem.cc | 4 +- storage/xtradb/fts/fts0fts.cc | 43 +- storage/xtradb/fts/fts0que.cc | 20 +- storage/xtradb/handler/ha_innodb.cc | 10 +- storage/xtradb/handler/handler0alter.cc | 12 +- storage/xtradb/include/btr0cur.h | 12 +- storage/xtradb/include/data0type.ic | 2 + storage/xtradb/include/mtr0mtr.h | 16 +- storage/xtradb/include/mtr0mtr.ic | 6 +- storage/xtradb/include/row0upd.h | 4 +- storage/xtradb/include/row0upd.ic | 4 +- storage/xtradb/include/trx0undo.h | 13 +- storage/xtradb/include/univ.i | 4 +- storage/xtradb/include/ut0ut.h | 11 +- storage/xtradb/lock/lock0lock.cc | 5 +- storage/xtradb/mem/mem0mem.cc | 5 + storage/xtradb/page/page0page.cc | 17 +- storage/xtradb/row/row0ext.cc | 3 +- storage/xtradb/row/row0ftsort.cc | 3 +- storage/xtradb/row/row0import.cc | 2 +- storage/xtradb/row/row0ins.cc | 24 +- storage/xtradb/row/row0log.cc | 4 +- storage/xtradb/row/row0merge.cc | 4 +- storage/xtradb/row/row0mysql.cc | 8 +- storage/xtradb/row/row0sel.cc | 17 +- storage/xtradb/row/row0umod.cc | 14 +- storage/xtradb/row/row0upd.cc | 12 +- storage/xtradb/trx/trx0purge.cc | 2 +- storage/xtradb/trx/trx0rec.cc | 8 +- storage/xtradb/trx/trx0trx.cc | 4 +- storage/xtradb/trx/trx0undo.cc | 16 +- storage/xtradb/ut/ut0ut.cc | 30 +- 323 files changed, 5001 insertions(+), 2835 deletions(-) diff --cc debian/control index f24aabaaf94,862cd4f3cea..bb52fe0ec4d --- 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); } -