- commits - lists.mariadb.org

[Commits] cdb2dc82c18: Merge remote-tracking branch 'origin/10.1' into 10.2
by jan 10 Mar '19

10 Mar '19

revision-id: cdb2dc82c181c8257016de1cba9c5563bc32986f (mariadb-10.2.22-47-gcdb2dc82c18) parent(s): ab7e2b048d7d0835ae7473873169b7606114348e b31d025c97cf49ea9d0da26e5948f693e8af60dc author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-10 11:09:45 +0200 message: Merge remote-tracking branch 'origin/10.1' into 10.2 mysql-test/suite/galera/disabled.def | 3 + .../suite/galera/r/galera_kill_nochanges.result | 2 + .../suite/galera/r/galera_kill_smallchanges.result | 2 + mysql-test/suite/galera/r/galera_many_rows.result | 28 ++++---- .../suite/galera/r/galera_var_dirty_reads.result | 2 - .../galera/t/galera_autoinc_sst_mariabackup.test | 10 +-- .../suite/galera/t/galera_kill_nochanges.test | 9 ++- .../suite/galera/t/galera_kill_smallchanges.test | 9 ++- mysql-test/suite/galera/t/galera_many_rows.cnf | 5 ++ mysql-test/suite/galera/t/galera_many_rows.test | 19 ++++-- .../suite/galera/t/galera_var_dirty_reads.test | 5 -- .../r/galera_ipv6_mariabackup_section.result | 23 +++++++ .../r/galera_ipv6_rsync_section.result | 17 +++++ .../t/galera_ipv6_mariabackup_section.cnf | 39 +++++++++++ .../t/galera_ipv6_mariabackup_section.opt | 1 + .../t/galera_ipv6_mariabackup_section.test | 69 +++++++++++++++++++ .../galera_3nodes/t/galera_ipv6_rsync_section.cnf | 31 +++++++++ .../galera_3nodes/t/galera_ipv6_rsync_section.opt | 1 + .../galera_3nodes/t/galera_ipv6_rsync_section.test | 32 +++++++++ scripts/wsrep_sst_common.sh | 2 - scripts/wsrep_sst_mariabackup.sh | 77 +++++++++++++--------- scripts/wsrep_sst_rsync.sh | 5 +- scripts/wsrep_sst_xtrabackup-v2.sh | 3 - 23 files changed, 316 insertions(+), 78 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index 4a6e6919511,baa5afd95a6..f11cd61b6c4 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -11,9 -11,6 +11,10 @@@ ############################################################################## GAL-419 : MDEV-13549 Galera test failures ++MW-286 : MDEV-18874 Galera test MW-286 causes Mutex = TTASEventMutex<GenericPolicy>]: Assertion `!is_owned()' failed. assertion +MW-328A : MDEV-17847 Galera test failure on MW-328[A|B|C] +MW-328B : MDEV-17847 Galera test failure on MW-328[A|B|C] +MW-328C : MDEV-17847 Galera test failure on MW-328[A|B|C] MW-329 : wsrep_local_replays not stable MW-336 : MDEV-13549 Timeout in wait_condition.inc for PROCESSLIST MW-416 : MDEV-13549 Galera test failures @@@ -26,19 -22,28 +27,21 @@@ galera_as_slave_replication_bundle : MD galera_binlog_rows_query_log_events: MariaDB does not support binlog_rows_query_log_events galera_binlog_stmt_autoinc : MDEV-13549 auto_increment mismatch galera_flush : MariaDB does not have global.thread_statistics ++galera_gcache_recover_manytrx : MDEV-18834 Galera test failure on galera_gcache_recover_manytrx galera_gcs_fc_limit : MDEV-17061 Timeout in wait_condition.inc for PROCESSLIST ++galera_ist_mariabackup : MDEV-18829 Galera test galera_ist_mariabackup leaves port open causing following SST tests to fail +galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status +galera_kill_applier : race condition at the start of the test +galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl galera_migrate : MariaDB does not support START SLAVE USER -galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb +galera_pc_ignore_sb : MDEV-15811/MDEV-17357 Test failure galera_ssl_upgrade : MDEV-13549 Galera test failures -MW-329 : wsrep_local_replays not stable -MW-416 : MDEV-13549 Galera test failures -MW-44 : MDEV-15809 Test failure on galera.MW-44 -galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb -galera_kill_applier : race condition at the start of the test -galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status -pxc-421: Lock timeout exceeded galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure +galera_sst_xtrabackup-v2 : MDEV-17848 Galera test failure +galera_sst_xtrabackup-v2_data_dir : MDEV-17848 Galera test failure +galera_var_node_address : MDEV-17151 Galera test failure galera_var_notify_cmd : MDEV-13549 Galera test failures -galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl -galera_var_node_address : MDEV-17151 Galera test failure on galera.galera_var_node_address -galera_as_slave_replication_bundle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan partition : MDEV-13549 regularly showing auto_increment mismatch -galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb -MW-328A : MDEV-17847 Galera test failure on MW-328[A|B|C] -MW-328B : MDEV-17847 Galera test failure on MW-328[A|B|C] -MW-328C : MDEV-17847 Galera test failure on MW-328[A|B|C] +pxc-421: Lock timeout exceeded query_cache : MDEV-18137: Galera test failure on query_cache -galera_ist_mariabackup : MDEV-18829 Galera test galera_ist_mariabackup leaves port open causing following SST tests to fail -galera.galera_gcache_recover_manytrx : MDEV-18834 Galera test failure on galera_gcache_recover_manytrx diff --cc mysql-test/suite/galera/r/galera_kill_nochanges.result index 56caf1bd9ea,cdcebdb4eee..3ccf73f0d46 --- a/mysql-test/suite/galera/r/galera_kill_nochanges.result +++ b/mysql-test/suite/galera/r/galera_kill_nochanges.result @@@ -1,13 -1,8 +1,15 @@@ +connection node_1; ++connection node_2; ++connection node_1; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); +connection node_2; Killing server ... +connection node_1; SET SESSION wsrep_sync_wait = 0; SET SESSION wsrep_sync_wait = DEFAULT; +connection node_2; +connection node_2a; SELECT COUNT(*) = 1 FROM t1; COUNT(*) = 1 1 diff --cc mysql-test/suite/galera/r/galera_kill_smallchanges.result index 2ee291004b0,863b49dd51b..07d1d12ef9e --- a/mysql-test/suite/galera/r/galera_kill_smallchanges.result +++ b/mysql-test/suite/galera/r/galera_kill_smallchanges.result @@@ -1,13 -1,8 +1,15 @@@ ++connection node_1; ++connection node_2; call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); +connection node_1; SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true'; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; +connection node_2; Killing server ... +connection node_1; INSERT INTO t1 VALUES (1); +connection node_2; +connection node_2a; SELECT COUNT(*) = 1 FROM t1; COUNT(*) = 1 1 diff --cc mysql-test/suite/galera/r/galera_many_rows.result index b06925fea60,6f441d9b401..d6669fe6bdf --- a/mysql-test/suite/galera/r/galera_many_rows.result +++ b/mysql-test/suite/galera/r/galera_many_rows.result @@@ -1,7 -1,6 +1,9 @@@ +connection node_1; ++connection node_2; ++connection node_1; SET SESSION innodb_lock_wait_timeout=600; SET SESSION lock_wait_timeout=600; - CREATE TABLE ten (f1 INTEGER); + CREATE TABLE ten (f1 INTEGER) engine=InnoDB; INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10); CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 INTEGER) Engine=InnoDB; INSERT INTO t1 (f2) SELECT a1.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5; @@@ -9,32 -7,26 +11,32 @@@ connection node_2 SET SESSION wsrep_sync_wait = 0; SET SESSION wsrep_sync_wait = 15; SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT1H'; - SELECT COUNT(*) = 100000 FROM t1; - COUNT(*) = 100000 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 100000 INSERT INTO t1 (f2) SELECT a1.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5; +connection node_1; - SELECT COUNT(*) = 200000 FROM t1; - COUNT(*) = 200000 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 200000 UPDATE t1 SET f2 = 1; +connection node_2; - SELECT COUNT(*) = 200000 FROM t1 WHERE f2 = 1; - COUNT(*) = 200000 - 1 + SELECT COUNT(*) FROM t1 WHERE f2 = 1; + COUNT(*) + 200000 +connection node_1; START TRANSACTION; - SELECT COUNT(*) = 200000 FROM t1; - COUNT(*) = 200000 - 1 + SELECT COUNT(*) FROM t1; + COUNT(*) + 200000 UPDATE t1 SET f2 = 3; +connection node_2; START TRANSACTION; UPDATE t1 SET f2 = 4; +connection node_1; COMMIT; +connection node_2; COMMIT; -ERROR 40001: Deadlock found when trying to get lock; try restarting transaction +ERROR 40001: Deadlock: wsrep aborted transaction DROP TABLE t1; DROP TABLE ten; diff --cc mysql-test/suite/galera/r/galera_var_dirty_reads.result index 049aa5be3cc,5a108ddfcaa..020efb7b8f1 --- a/mysql-test/suite/galera/r/galera_var_dirty_reads.result +++ b/mysql-test/suite/galera/r/galera_var_dirty_reads.result @@@ -1,8 -1,3 +1,6 @@@ +connection node_1; +connection node_2; - connection node_1; - connection node_2; +connection node_2; CREATE TABLE t1(i INT) ENGINE=INNODB; INSERT INTO t1 VALUES(1); SELECT * FROM t1; diff --cc mysql-test/suite/galera/t/galera_kill_smallchanges.test index 148c3dbc132,148c3dbc132..07c9dd52b3e --- a/mysql-test/suite/galera/t/galera_kill_smallchanges.test +++ b/mysql-test/suite/galera/t/galera_kill_smallchanges.test @@@ -3,7 -3,7 +3,11 @@@ # --source include/galera_cluster.inc ----source include/have_innodb.inc ++ ++# Save original auto_increment_offset values. ++--let $node_1=node_1 ++--let $node_2=node_2 ++--source include/auto_increment_offset_save.inc call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); @@@ -38,4 -38,4 +42,7 @@@ SELECT VARIABLE_VALUE = 2 FROM INFORMAT --eval SET GLOBAL wsrep_provider_options = '$wsrep_provider_options_orig'; --enable_query_log ++--let $node_2=node_2a ++--source include/auto_increment_offset_restore.inc ++ DROP TABLE t1; diff --cc mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result index 00000000000,53e35939a79..5a844537327 mode 000000,100644..100644 --- a/mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result +++ b/mysql-test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result @@@ -1,0 -1,18 +1,23 @@@ + SELECT VARIABLE_VALUE LIKE '%[::1]%' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_incoming_addresses'; + VARIABLE_VALUE LIKE '%[::1]%' + 1 + SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; + VARIABLE_VALUE = 3 + 1 ++connection node_2; + SET GLOBAL wsrep_provider_options='gmcast.isolate=1'; ++connection node_1; + CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; + INSERT INTO t1 VALUES (1); ++connection node_2; + SET GLOBAL wsrep_provider_options='gmcast.isolate=0'; + SELECT COUNT(*) = 1 FROM t1; + COUNT(*) = 1 + 1 + DROP TABLE t1; ++connection node_1; + include/assert_grep.inc [Streaming the backup to joiner at \[::1\]] + include/assert_grep.inc [async IST sender starting to serve tcp://\[::1\]:] ++connection node_2; + include/assert_grep.inc [IST receiver addr using tcp://\[::1\]] + include/assert_grep.inc [Prepared IST receiver, listening at: tcp://\[::1\]] diff --cc mysql-test/suite/galera_3nodes/r/galera_ipv6_rsync_section.result index 00000000000,a2bf5f4d98c..bcf74142144 mode 000000,100644..100644 --- a/mysql-test/suite/galera_3nodes/r/galera_ipv6_rsync_section.result +++ b/mysql-test/suite/galera_3nodes/r/galera_ipv6_rsync_section.result @@@ -1,0 -1,14 +1,17 @@@ + SELECT VARIABLE_VALUE LIKE '%[::1]%' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_incoming_addresses'; + VARIABLE_VALUE LIKE '%[::1]%' + 1 + SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; + VARIABLE_VALUE = 3 + 1 ++connection node_2; + SET GLOBAL wsrep_provider_options='gmcast.isolate=1'; ++connection node_1; + CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; + INSERT INTO t1 VALUES (1); ++connection node_2; + SET GLOBAL wsrep_provider_options='gmcast.isolate=0'; + SELECT COUNT(*) = 1 FROM t1; + COUNT(*) = 1 + 1 + DROP TABLE t1; diff --cc scripts/wsrep_sst_mariabackup.sh index 039a350b18a,e8344bbaf8d..a763dadc2d8 --- a/scripts/wsrep_sst_mariabackup.sh +++ b/scripts/wsrep_sst_mariabackup.sh @@@ -554,10 -549,10 +549,10 @@@ wait_for_listen( do if [ "$OS" = "FreeBSD" ];then sockstat -46lp $PORT | grep -qE "^[^ ]* *(socat|nc) *[^ ]* *[^ ]* *[^ ]* *[^ ]*:$PORT" && break - else + else - ss -p state listening "( sport = :$PORT )" | grep -qE 'socat|nc' && break + ss -p state listening "( sport = :$PORT )" | grep -qE 'socat|nc' && break - fi + fi - sleep 0.2 + sleep 0.2 done echo "ready ${ADDR}/${MODULE}//$sst_ver" }

1 0

[Commits] 4a9e653bba8: Merge branch '10.1' of github.com:MariaDB/server into 10.1
by jan 09 Mar '19

09 Mar '19

revision-id: 4a9e653bba8f1847048133da3043be1e7542d6a8 (mariadb-10.1.38-26-g4a9e653bba8) parent(s): cde26a44a023d23dabfebbc5ed5e796eebb64f3e 6567636b09ba410a330cd45285e489c628c4ff37 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-09 08:40:12 +0200 message: Merge branch '10.1' of github.com:MariaDB/server into 10.1 cmake/plugin.cmake | 2 +- dbug/tests.c | 8 + extra/mariabackup/backup_copy.cc | 6 +- extra/mariabackup/backup_mysql.cc | 14 +- extra/mariabackup/encryption_plugin.cc | 8 +- extra/mariabackup/fil_cur.cc | 6 +- extra/mariabackup/xtrabackup.cc | 27 ++- include/my_pthread.h | 6 +- mysql-test/r/mysqld--help,win.rdiff | 2 +- mysql-test/r/mysqld--help.result | 2 +- mysql-test/suite/galera/disabled.def | 19 +- mysql-test/suite/innodb/r/alter_crash.result | 152 ++++++++++++++ mysql-test/suite/innodb/t/alter_crash.test | 229 +++++++++++++++++++++ .../mariabackup/page_compression_level.result | 14 ++ .../suite/mariabackup/page_compression_level.test | 31 +++ mysql-test/suite/sys_vars/inc/sysvars_server.inc | 2 +- .../sys_vars/r/sysvars_server_embedded.result | 4 +- .../sys_vars/r/sysvars_server_notembedded.result | 4 +- .../suite/sys_vars/r/thread_stack_basic.result | 10 +- .../suite/sys_vars/t/thread_stack_basic.test | 10 +- mysql-test/t/mysqld--help.test | 2 +- sql/sql_parse.cc | 5 + storage/innobase/dict/dict0dict.cc | 26 ++- storage/innobase/fts/fts0fts.cc | 8 +- storage/innobase/fts/fts0opt.cc | 19 +- storage/innobase/handler/handler0alter.cc | 12 +- storage/innobase/include/dict0crea.ic | 10 +- storage/innobase/include/ut0dbg.h | 3 +- storage/innobase/row/row0ftsort.cc | 17 +- storage/innobase/row/row0merge.cc | 17 +- storage/innobase/row/row0mysql.cc | 17 +- storage/innobase/srv/srv0start.cc | 7 +- storage/xtradb/dict/dict0dict.cc | 26 ++- storage/xtradb/fts/fts0fts.cc | 13 +- storage/xtradb/fts/fts0opt.cc | 19 +- storage/xtradb/handler/handler0alter.cc | 12 +- storage/xtradb/include/dict0crea.ic | 10 +- storage/xtradb/include/log0online.h | 3 +- storage/xtradb/include/ut0dbg.h | 3 +- storage/xtradb/log/log0online.cc | 7 +- storage/xtradb/row/row0ftsort.cc | 17 +- storage/xtradb/row/row0merge.cc | 17 +- storage/xtradb/row/row0mysql.cc | 17 +- storage/xtradb/srv/srv0start.cc | 7 +- 44 files changed, 679 insertions(+), 171 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index 1fc67475b93,4b70a84ac2e..a000ad89217 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -15,28 -18,15 +18,32 @@@ galera_account_management : MariaDB 10. galera_as_master_gtid : Requires MySQL GTID galera_as_master_gtid_change_master : Requires MySQL GTID galera_as_slave_preordered : wsrep-preordered feature not merged to MariaDB - GAL-419 : MDEV-13549 Galera test failures - galera_var_notify_cmd : MDEV-13549 Galera test failures + galera_as_slave_replication_bundle : MDEV-15785 OPTION_GTID_BEGIN is set in Gtid_log_event::do_apply_event() + galera_binlog_rows_query_log_events: MariaDB does not support binlog_rows_query_log_events + galera_binlog_stmt_autoinc : MDEV-13549 auto_increment mismatch + galera_flush : MariaDB does not have global.thread_statistics + galera_gcs_fc_limit : MDEV-17061 Timeout in wait_condition.inc for PROCESSLIST + galera_migrate : MariaDB does not support START SLAVE USER + galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb galera_ssl_upgrade : MDEV-13549 Galera test failures +MW-329 : wsrep_local_replays not stable +MW-416 : MDEV-13549 Galera test failures +MW-44 : MDEV-15809 Test failure on galera.MW-44 +galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb +galera_kill_applier : race condition at the start of the test +galera_ist_progress: MDEV-15236 galera_ist_progress fails when trying to read transfer status +pxc-421: Lock timeout exceeded galera_sst_mysqldump_with_key : MDEV-16890 Galera test failure +galera_kill_ddl : MDEV-17108 Test failure on galera.galera_kill_ddl + galera_var_notify_cmd : MDEV-13549 Galera test failures +galera_var_node_address : MDEV-17151 Galera test failure on galera.galera_var_node_address - galera_gc_fc_limit : MDEV-17061 Test failure on galera.galera_gc_fc_limit +galera_as_slave_replication_bundle : MDEV-15785 Test case galera_as_slave_replication_bundle caused debug assertion galera_wan : MDEV-17259: Test failure on galera.galera_wan + partition : MDEV-13549 regularly showing auto_increment mismatch +galera_pc_ignore_sb : MDEV-17357 Test failure on galera.galera_pc_ignore_sb +MW-328A : MDEV-17847 Galera test failure on MW-328[A|B|C] +MW-328B : MDEV-17847 Galera test failure on MW-328[A|B|C] +MW-328C : MDEV-17847 Galera test failure on MW-328[A|B|C] +query_cache : MDEV-18137: Galera test failure on query_cache +galera_ist_mariabackup : MDEV-18829 Galera test galera_ist_mariabackup leaves port open causing following SST tests to fail +galera.galera_gcache_recover_manytrx : MDEV-18834 Galera test failure on galera_gcache_recover_manytrx

1 0

[Commits] 9512d3659c2: Test failure: mysqltest: Result length mismatch
by Oleksandr Byelkin 08 Mar '19

08 Mar '19

revision-id: 9512d3659c26019e37e643ee54e3d161a263dbcb (mariadb-10.4.3-50-g9512d3659c2) parent(s): 5c6fdf420ef4bc22d20b9273961fe51e50a4f1dc author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-03-08 15:52:13 +0100 message: Test failure: mysqltest: Result length mismatch --- mysql-test/suite/galera/disabled.def | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 930229fc6da..3a8cab30c71 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -53,3 +53,4 @@ galera.galera_kill_nochanges : MDEV-18280 Galera test failure on galera_split_br galera.galera_split_brain : MDEV-18280 Galera test failure on galera_split_brain and galera_kill_nochanges galera.galera_bf_abort_group_commit : MDEV-18282 Galera test failure on galera.galera_bf_abort_group_commit galera.GCF-1081 : MDEV-18283 Galera test failure on galera.GCF-1081 +galera.MW-388: MDEV-18837 Test failure: mysqltest: Result length mismatch

1 0

[Commits] 63e35e1c72b: Fix of PS after merge from 10.2.
by Oleksandr Byelkin 08 Mar '19

08 Mar '19

revision-id: 63e35e1c72bb860894eada4141ed8175313473d5 (mariadb-10.3.12-76-g63e35e1c72b) parent(s): d30f17af4969cc1ce34f1925f5ea2bced9c6f7e9 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-03-08 15:04:52 +0100 message: Fix of PS after merge from 10.2. TVC uses derived as singlatable calls --- sql/sql_derived.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index e6a2d54ae6f..960ee948cf7 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -179,6 +179,7 @@ mysql_handle_single_derived(LEX *lex, TABLE_LIST *derived, uint phases) if (!lex->derived_tables) DBUG_RETURN(FALSE); + derived->select_lex->changed_elements|= TOUCHED_SEL_DERIVED; lex->thd->derived_tables_processing= TRUE; for (uint phase= 0; phase < DT_PHASES; phase++)

1 0

[Commits] b2bb6a03312: MDEV-18373: DENSE_RANK is not calculated correctly
by Varun 08 Mar '19

08 Mar '19

revision-id: b2bb6a033125432c807be8464506ca12f09028fe (mariadb-10.2.22-46-gb2bb6a03312) parent(s): bf71d263621c90cbddc7bde9bf071dae503f333f author: Varun Gupta committer: Varun Gupta timestamp: 2019-03-08 17:21:57 +0530 message: MDEV-18373: DENSE_RANK is not calculated correctly Need to call split_sum_func if an aggregate function is part of order by or partition by clause so that we have the required fields inside the temporary table, as all the fields inside the partition by and order by clause of the window function needs to be there in the temp table used for window function computation. --- mysql-test/r/win.result | 26 ++++++++++++++++++++++++++ mysql-test/t/win.test | 14 ++++++++++++++ sql/sql_select.cc | 8 ++++++++ 3 files changed, 48 insertions(+) diff --git a/mysql-test/r/win.result b/mysql-test/r/win.result index 2e80c2c961b..54d2c85f8cd 100644 --- a/mysql-test/r/win.result +++ b/mysql-test/r/win.result @@ -3488,3 +3488,29 @@ ifnull(max(n1) over (partition by n1),'aaa') 4 drop table t1; drop view v1; +# +# MDEV-18373: DENSE_RANK is not calculated correctly +# +create table t1 (a int, b int); +insert into t1 values (60, 1515),(60, 2000),(70, 2000),(55, 1600); +select dense_rank() over (order by sum(a)) from t1 group by b; +dense_rank() over (order by sum(a)) +2 +1 +3 +select dense_rank() over (order by sum(a)+1) from t1 group by b; +dense_rank() over (order by sum(a)+1) +2 +1 +3 +select row_number() over (partition by sum(a)) from t1 group by b; +row_number() over (partition by sum(a)) +1 +1 +1 +select row_number() over (partition by sum(a)+1) from t1 group by b; +row_number() over (partition by sum(a)+1) +1 +1 +1 +drop table t1; diff --git a/mysql-test/t/win.test b/mysql-test/t/win.test index 18bdfa31691..f4d8f207d45 100644 --- a/mysql-test/t/win.test +++ b/mysql-test/t/win.test @@ -2240,3 +2240,17 @@ explain select * from v1; select * from v1; drop table t1; drop view v1; + +--echo # +--echo # MDEV-18373: DENSE_RANK is not calculated correctly +--echo # + +create table t1 (a int, b int); +insert into t1 values (60, 1515),(60, 2000),(70, 2000),(55, 1600); + +select dense_rank() over (order by sum(a)) from t1 group by b; +select dense_rank() over (order by sum(a)+1) from t1 group by b; + +select row_number() over (partition by sum(a)) from t1 group by b; +select row_number() over (partition by sum(a)+1) from t1 group by b; +drop table t1; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 91a6445c870..bc6e50aa563 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -22557,6 +22557,10 @@ int setup_order(THD *thd, Ref_ptr_array ref_pointer_array, TABLE_LIST *tables, my_error(ER_WINDOW_FUNCTION_IN_WINDOW_SPEC, MYF(0)); return 1; } + if (from_window_spec && (*order->item)->with_sum_func && + (*order->item)->type() != Item::SUM_FUNC_ITEM) + (*order->item)->split_sum_func(thd, ref_pointer_array, + all_fields, SPLIT_SUM_SELECT); } return 0; } @@ -22624,6 +22628,10 @@ setup_group(THD *thd, Ref_ptr_array ref_pointer_array, TABLE_LIST *tables, my_error(ER_WINDOW_FUNCTION_IN_WINDOW_SPEC, MYF(0)); return 1; } + if (from_window_spec && (*ord->item)->with_sum_func && + (*ord->item)->type() != Item::SUM_FUNC_ITEM) + (*ord->item)->split_sum_func(thd, ref_pointer_array, + all_fields, SPLIT_SUM_SELECT); } if (thd->variables.sql_mode & MODE_ONLY_FULL_GROUP_BY && context_analysis_place == IN_GROUP_BY)

1 0

[Commits] cde26a44a02: Decrease the time required to run test by removing unnecessary sleeps.
by jan 08 Mar '19

08 Mar '19

revision-id: cde26a44a023d23dabfebbc5ed5e796eebb64f3e (mariadb-10.1.38-25-gcde26a44a02) parent(s): 059b0adf81846721a11caa7a73a190d5e1115594 author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-08 10:13:14 +0200 message: Decrease the time required to run test by removing unnecessary sleeps. modified: suite/galera/t/galera_autoinc_sst_mariabackup.test --- mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test b/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test index 731059dc584..20f2fb9dea0 100644 --- a/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test +++ b/mysql-test/suite/galera/t/galera_autoinc_sst_mariabackup.test @@ -5,7 +5,6 @@ --source include/big_test.inc --source include/galera_cluster.inc ---source include/have_innodb.inc --source include/have_mariabackup.inc --connection node_1 @@ -29,11 +28,11 @@ END| DELIMITER ;| --send CALL p1(); ---sleep 2 +--sleep 1 --connection node_2 --send CALL p1(); ---sleep 2 +--sleep 1 # Kill and restart node #2 @@ -41,10 +40,7 @@ DELIMITER ;| --connection node_2a --source include/kill_galera.inc ---sleep 10 --source include/start_mysqld.inc ---sleep 25 ---source include/wait_until_connected_again.inc INSERT INTO t1 VALUES (DEFAULT); @@ -68,8 +64,6 @@ INSERT INTO t1 VALUES (DEFAULT); --error 2013,2006 --reap ---sleep 10 - # Confirm that the count is correct and that the cluster is intact --connection node_1a

1 0

[Commits] 283c806: Scripts to setup servers
by Sergei Petrunia 07 Mar '19

07 Mar '19

revision-id: 283c806ee63fb19e7c3a895181dd54152db83862 () parent(s): de028bfaf6f7e27374f8a298b4e5fbf0012ed5d7 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-03-07 21:26:38 +0300 message: Scripts to setup servers --- .gitignore | 3 ++ setup-server/setup-fbmysql-clone.sh | 68 +++++++++++++++++++++++++++++++++++ setup-server/setup-os-ubuntu.sh | 21 +++++++++++ setup-server/setup-sysbench-ubuntu.sh | 5 +++ setup.sh | 7 ++++ 5 files changed, 104 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9e086cc --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +data-fbmysql-range-locking +mysql-5.6-orig +mysql-5.6-range-locking diff --git a/setup-server/setup-fbmysql-clone.sh b/setup-server/setup-fbmysql-clone.sh new file mode 100755 index 0000000..815c7bd --- /dev/null +++ b/setup-server/setup-fbmysql-clone.sh @@ -0,0 +1,68 @@ +set -e + +# Usage: name [revno] +name=$1 +branch=$2 +revno=$3 + +if [ "x${name}y" = "xy" ] ; then + echo "usage: $0 name branch [revno]" +fi + +# range-locking-fb-mysql-5.6.35 +if [ "x${branch}y" = "xy" ] ; then + echo "usage: $0 name branch [revno]" +fi + +DATADIR=`pwd`/data-fbmysql-$name +BASEDIR=`pwd`/mysql-5.6-name + +#git clone --branch $branch --depth 1 https://github.com/spetrunia/mysql-5.6.git mysql-5.6-$name +git clone --branch $branch --single-branch https://github.com/spetrunia/mysql-5.6.git mysql-5.6-$name +cd mysql-5.6-$name + +if [ "x${revno}y" != "xy" ] ; then + git reset --hard $revno +fi + +git submodule init +git submodule update +cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_SSL=system \ + -DWITH_ZLIB=bundled -DMYSQL_MAINTAINER_MODE=0 -DENABLED_LOCAL_INFILE=1 \ + -DENABLE_DTRACE=0 -DCMAKE_CXX_FLAGS="-march=native" +make -j8 + +cd mysql-test +./mtr alias +cp -r var/install.db $DATADIR +cd ../.. + +cat > my-fbmysql-$name.cnf << EOF +[mysqld] + +datadir=$DATADIR + +default-storage-engine=rocksdb +skip-innodb +default-tmp-storage-engine=MyISAM +rocksdb + +#debug +log-bin=pslp +binlog-format=row + +tmpdir=/tmp +port=3306 +socket=/tmp/mysql.sock +gdb + +language=$BASEDIR/share/english +server-id=12 + +# rocksdb_use_range_locking=1 +EOF + +echo "$BASEDIR/sql/mysqld --defaults-file=`pwd`/my-fbmysql-$name.cnf" + +#(cd ./mysql-5.6/sql; ./mysqld --defaults-file=../../my-fbmysql.cnf & ) + diff --git a/setup-server/setup-os-ubuntu.sh b/setup-server/setup-os-ubuntu.sh new file mode 100755 index 0000000..70c57ad --- /dev/null +++ b/setup-server/setup-os-ubuntu.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +if [ -e /etc/debian_version ] ; then + sudo apt-get update + sudo apt-get -y install g++ cmake libbz2-dev libaio-dev bison zlib1g-dev libsnappy-dev libboost-all-dev + sudo apt-get -y install libgflags-dev libreadline6-dev libncurses5-dev liblz4-dev gdb git libzstd-dev + + sudo apt-get -y install libzstd0 + sudo apt-get -y install libssl-dev + +# percona server: + sudo apt-get -y install libcurl4-gnutls-dev + + sudo apt-get -y install sysstat + + sudo ln -s /usr/lib/x86_64-linux-gnu/libz.so /usr/lib/libz.so + sudo sh -c "echo 0 > /proc/sys/kernel/yama/ptrace_scope" + +# Need unzip to unpack TPC-DS generator + sudo apt-get -y install unzip +fi diff --git a/setup-server/setup-sysbench-ubuntu.sh b/setup-server/setup-sysbench-ubuntu.sh new file mode 100755 index 0000000..5af9a9a --- /dev/null +++ b/setup-server/setup-sysbench-ubuntu.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +curl -s https://packagecloud.io/install/repositories/akopytov/sysbench/script.deb.sh | sudo bash +sudo apt-get -y install sysbench + diff --git a/setup.sh b/setup.sh new file mode 100644 index 0000000..073cf37 --- /dev/null +++ b/setup.sh @@ -0,0 +1,7 @@ +#!/bin/bash + + +./setup-server/setup-fbmysql-clone.sh range-locking range-locking-fb-mysql-5.6.35 +./setup-server/setup-fbmysql-clone.sh orig fb-mysql-5.6.35-rebase1-source + +

1 0

[Commits] 5451240f57b: ANALYZE SELECT with PS fix
by Oleksandr Byelkin 07 Mar '19

07 Mar '19

revision-id: 5451240f57bf17851d3f486b0c1c895748f479b7 (mariadb-10.4.3-43-g5451240f57b) parent(s): acc8c7068fa3d866305763cf6f62175ad1525650 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-03-07 16:18:31 +0100 message: ANALYZE SELECT with PS fix --- sql/sql_prepare.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 94f87a88155..cb06dee0cd5 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2548,8 +2548,12 @@ static bool check_prepared_statement(Prepared_statement *stmt) { if (lex->describe || lex->analyze_stmt) { - if (!lex->result && - !(lex->result= new (stmt->mem_root) select_send(thd))) + /* + With EXPAIN (describe) and ANALYZE STATEMENT we ignore original + result sending class and always send special result set to the + client + */ + if (!(lex->result= new (stmt->mem_root) select_send(thd))) DBUG_RETURN(TRUE); List<Item> field_list; res= thd->prepare_explain_fields(lex->result, &field_list,

1 0

[Commits] acc8c7068fa: Fix of prepared CREATE VIEW with global ORDER/GROUP
by Oleksandr Byelkin 07 Mar '19

07 Mar '19

revision-id: acc8c7068fa3d866305763cf6f62175ad1525650 (mariadb-10.4.3-42-gacc8c7068fa) parent(s): 04e00aa034ade8aeba0b49f014b892b76b138c52 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-03-07 11:30:06 +0100 message: Fix of prepared CREATE VIEW with global ORDER/GROUP --- sql/sql_union.cc | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/sql/sql_union.cc b/sql/sql_union.cc index a1d86959218..56b9c792771 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -1240,15 +1240,6 @@ bool st_select_lex_unit::prepare(TABLE_LIST *derived_arg, allocation in setup_ref_array(). */ fake_select_lex->n_child_sum_items+= global_parameters()->n_sum_items; - - saved_error= fake_select_lex->join-> - prepare(fake_select_lex->table_list.first, - 0, 0, - global_parameters()->order_list.elements, // og_num - global_parameters()->order_list.first, // order - false, NULL, NULL, NULL, - fake_select_lex, this); - fake_select_lex->table_list.empty(); } } else @@ -1259,6 +1250,26 @@ bool st_select_lex_unit::prepare(TABLE_LIST *derived_arg, */ table->reset_item_list(&item_list, intersect_mark ? 1 : 0); } + if (fake_select_lex != NULL && + (thd->stmt_arena->is_stmt_prepare() || + (thd->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW))) + { + if (!fake_select_lex->join && + !(fake_select_lex->join= + new JOIN(thd, item_list, thd->variables.option_bits, result))) + { + fake_select_lex->table_list.empty(); + DBUG_RETURN(TRUE); + } + saved_error= fake_select_lex->join-> + prepare(fake_select_lex->table_list.first, + 0, 0, + global_parameters()->order_list.elements, // og_num + global_parameters()->order_list.first, // order + false, NULL, NULL, NULL, + fake_select_lex, this); + fake_select_lex->table_list.empty(); + } } thd->lex->current_select= lex_select_save;

1 0

[Commits] 7b91d30: MDEV-17595 - ALTER TABLE ADD FOREIGN KEY crash
by Sergey Vojtovich 07 Mar '19

07 Mar '19

revision-id: 7b91d3088301badc6617663565ea6fc8c4b88e3f (mariadb-10.0.38-4-g7b91d30) parent(s): 2d34713294d5339d1459911a46fa20395443b3c7 author: Sergey Vojtovich committer: Sergey Vojtovich timestamp: 2019-03-07 14:00:19 +0400 message: MDEV-17595 - ALTER TABLE ADD FOREIGN KEY crash ALTER TABLE ... ADD FOREIGN KEY may trigger assertion failure when it has LOCK=EXCLUSIVE clause or concurrent FLUSH TABLES is being executed. In both cases being altered table is marked as flushed, which forces subsequent attempt to open parent table to re-open. Which in turn is not allowed while transaction is running. Rather than opening parent table, just take appropriate MDL lock. Also removed table_already_fk_prelocked() check: MDL itself has much better methods to handle duplicate locks. E.g. the former won't acquire MDL_SHARED_NO_WRITE if it already has MDL_SHARED_READ. --- mysql-test/suite/innodb/r/foreign-keys.result | 13 +++++++++++++ mysql-test/suite/innodb/t/foreign-keys.test | 15 +++++++++++++++ sql/sql_table.cc | 20 ++++++++------------ 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/mysql-test/suite/innodb/r/foreign-keys.result b/mysql-test/suite/innodb/r/foreign-keys.result index 66fc00e..6852852 100644 --- a/mysql-test/suite/innodb/r/foreign-keys.result +++ b/mysql-test/suite/innodb/r/foreign-keys.result @@ -87,3 +87,16 @@ drop table t3; drop table t2; drop table t1; set debug_sync='reset'; +# +# MDEV-17595 - Server crashes in copy_data_between_tables or +# Assertion `thd->transaction.stmt.is_empty() || +# (thd->state_flags & Open_tables_state::BACKUPS_AVAIL)' +# fails in close_tables_for_reopen upon concurrent +# ALTER TABLE and FLUSH +# +CREATE TABLE t1 (a INT, KEY(a)) ENGINE=InnoDB; +INSERT INTO t1 VALUES(1),(2); +CREATE TABLE t2 (b INT, KEY(b)) ENGINE=InnoDB; +INSERT INTO t2 VALUES(2); +ALTER TABLE t2 ADD FOREIGN KEY(b) REFERENCES t1(a), LOCK=EXCLUSIVE; +DROP TABLE t2, t1; diff --git a/mysql-test/suite/innodb/t/foreign-keys.test b/mysql-test/suite/innodb/t/foreign-keys.test index 7ef440b..ced44a8 100644 --- a/mysql-test/suite/innodb/t/foreign-keys.test +++ b/mysql-test/suite/innodb/t/foreign-keys.test @@ -111,3 +111,18 @@ drop table t3; drop table t2; drop table t1; set debug_sync='reset'; + + +--echo # +--echo # MDEV-17595 - Server crashes in copy_data_between_tables or +--echo # Assertion `thd->transaction.stmt.is_empty() || +--echo # (thd->state_flags & Open_tables_state::BACKUPS_AVAIL)' +--echo # fails in close_tables_for_reopen upon concurrent +--echo # ALTER TABLE and FLUSH +--echo # +CREATE TABLE t1 (a INT, KEY(a)) ENGINE=InnoDB; +INSERT INTO t1 VALUES(1),(2); +CREATE TABLE t2 (b INT, KEY(b)) ENGINE=InnoDB; +INSERT INTO t2 VALUES(2); +ALTER TABLE t2 ADD FOREIGN KEY(b) REFERENCES t1(a), LOCK=EXCLUSIVE; +DROP TABLE t2, t1; diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 8a4c6e0..3b4ba72 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -9074,6 +9074,8 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, new_table->file->get_foreign_key_list(thd, &fk_list); while ((fk= fk_list_it++)) { + MDL_request mdl_request; + if (lower_case_table_names) { char buf[NAME_LEN]; @@ -9085,20 +9087,14 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, len = my_casedn_str(files_charset_info, buf); thd->make_lex_string(fk->referenced_table, buf, len); } - if (table_already_fk_prelocked(table_list, fk->referenced_db, - fk->referenced_table, TL_READ_NO_INSERT)) - continue; - TABLE_LIST *tl= (TABLE_LIST *) thd->alloc(sizeof(TABLE_LIST)); - tl->init_one_table_for_prelocking(fk->referenced_db->str, fk->referenced_db->length, - fk->referenced_table->str, fk->referenced_table->length, - NULL, TL_READ_NO_INSERT, false, NULL, 0, - &thd->lex->query_tables_last); + mdl_request.init(MDL_key::TABLE, + fk->referenced_db->str, fk->referenced_table->str, + MDL_SHARED_NO_WRITE, MDL_TRANSACTION); + if (thd->mdl_context.acquire_lock(&mdl_request, + thd->variables.lock_wait_timeout)) + goto err_new_table_cleanup; } - - if (open_tables(thd, &table_list->next_global, &tables_opened, 0, - &alter_prelocking_strategy)) - goto err_new_table_cleanup; } } /*

1 0