- commits - lists.mariadb.org

[Commits] 4d2a36e: Post-merge fix for rocksdb.add_index_inplace_sstfilewriter
by psergey＠askmonty.org 14 May '18

14 May '18

revision-id: 4d2a36e8bcaeced7095a5d4b40b87d6ffcfeafb1 parent(s): 279184a04d4028eecbc3c2d928ca270c4912fd10 committer: Sergei Petrunia branch nick: 10.2-r11 timestamp: 2018-05-14 20:25:02 +0300 message: Post-merge fix for rocksdb.add_index_inplace_sstfilewriter MariaDB has a scaled-down version of the test so we need to set @@rocksdb_max_row_locks lower to trigger the desired error (didn't catch this on test BB run because this test is marked as "big") --- .../mysql-test/rocksdb/r/add_index_inplace_sstfilewriter.result | 3 +++ .../rocksdb/mysql-test/rocksdb/t/add_index_inplace_sstfilewriter.test | 3 +++ 2 files changed, 6 insertions(+) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_sstfilewriter.result b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_sstfilewriter.result index 1836533..08f2329 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_sstfilewriter.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/add_index_inplace_sstfilewriter.result @@ -14,11 +14,14 @@ select count(b) from t1; count(b) 300000 ALTER TABLE t1 ADD INDEX kb(b), ALGORITHM=INPLACE; +set @tmp= @@rocksdb_max_row_locks; +set session rocksdb_max_row_locks=1000; ALTER TABLE t1 ADD INDEX kb_copy(b), ALGORITHM=COPY; ERROR HY000: Status error 10 received from RocksDB: Operation aborted: Failed to acquire lock due to max_num_locks limit set session rocksdb_bulk_load=1; ALTER TABLE t1 ADD INDEX kb_copy(b), ALGORITHM=COPY; set session rocksdb_bulk_load=0; +set session rocksdb_max_row_locks=@tmp; SELECT COUNT(*) as c FROM (SELECT COALESCE(LOWER(CONV(BIT_XOR(CAST(CRC32(CONCAT_WS('#', `b`, CONCAT(ISNULL(`b`)))) AS UNSIGNED)), 10, 16)), 0) AS crc FROM `t1` FORCE INDEX(`kb`) UNION DISTINCT diff --git a/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_sstfilewriter.test b/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_sstfilewriter.test index 3977b38..5eac859 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_sstfilewriter.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/add_index_inplace_sstfilewriter.test @@ -66,12 +66,15 @@ ALTER TABLE t1 ADD INDEX kb(b), ALGORITHM=INPLACE; --disable_warnings # now do same index using copy algorithm # hitting max row locks (1M) +set @tmp= @@rocksdb_max_row_locks; +set session rocksdb_max_row_locks=1000; --error ER_RDB_STATUS_GENERAL ALTER TABLE t1 ADD INDEX kb_copy(b), ALGORITHM=COPY; set session rocksdb_bulk_load=1; ALTER TABLE t1 ADD INDEX kb_copy(b), ALGORITHM=COPY; set session rocksdb_bulk_load=0; --enable_warnings +set session rocksdb_max_row_locks=@tmp; # checksum testing SELECT COUNT(*) as c FROM

1 0

[Commits] 9f9ab80: MDEV-14562: rocksdb.bloomfilter failed in buildbot
by psergey＠askmonty.org 14 May '18

14 May '18

revision-id: 9f9ab80dbf7dd33f45cd25187c8788d622251e10 parent(s): 16a8a241c297a4ae683523e68518aa85a129daea committer: Sergei Petrunia branch nick: 10.2-r11 timestamp: 2018-05-14 19:50:21 +0300 message: MDEV-14562: rocksdb.bloomfilter failed in buildbot Bloom filter is only used when reading the data from disk. If the data happens to be still in the memtable, bloomfilter wont be used. Stabilize the testcase by making sure the data is on disk before we read it. --- storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result | 5 +++++ storage/rocksdb/mysql-test/rocksdb/r/bloomfilter_skip.result | 5 +++++ storage/rocksdb/mysql-test/rocksdb/t/bloomfilter_load_select.inc | 1 + storage/rocksdb/mysql-test/rocksdb/t/disabled.def | 1 - 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result index 5f1083a..bc5d685 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result @@ -43,6 +43,7 @@ insert t1 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc" from seq_1_to_10000; insert t2 select * from t1; +set global rocksdb_force_flush_memtable_now=1; call bloom_start(); select count(*) from t1; count(*) @@ -443,6 +444,7 @@ insert t1 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc" from seq_1_to_10000; insert t2 select * from t1; +set global rocksdb_force_flush_memtable_now=1; call bloom_start(); select count(*) from t1; count(*) @@ -843,6 +845,7 @@ insert t1 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc" from seq_1_to_10000; insert t2 select * from t1; +set global rocksdb_force_flush_memtable_now=1; call bloom_start(); select count(*) from t1; count(*) @@ -1243,6 +1246,7 @@ insert t1 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc" from seq_1_to_10000; insert t2 select * from t1; +set global rocksdb_force_flush_memtable_now=1; call bloom_start(); select count(*) from t1; count(*) @@ -1643,6 +1647,7 @@ insert t1 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc" from seq_1_to_10000; insert t2 select * from t1; +set global rocksdb_force_flush_memtable_now=1; call bloom_start(); select count(*) from t1; count(*) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter_skip.result b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter_skip.result index 2496f34..2847563 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter_skip.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter_skip.result @@ -43,6 +43,7 @@ insert t1 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc" from seq_1_to_10000; insert t2 select * from t1; +set global rocksdb_force_flush_memtable_now=1; call bloom_start(); select count(*) from t1; count(*) @@ -443,6 +444,7 @@ insert t1 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc" from seq_1_to_10000; insert t2 select * from t1; +set global rocksdb_force_flush_memtable_now=1; call bloom_start(); select count(*) from t1; count(*) @@ -843,6 +845,7 @@ insert t1 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc" from seq_1_to_10000; insert t2 select * from t1; +set global rocksdb_force_flush_memtable_now=1; call bloom_start(); select count(*) from t1; count(*) @@ -1243,6 +1246,7 @@ insert t1 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc" from seq_1_to_10000; insert t2 select * from t1; +set global rocksdb_force_flush_memtable_now=1; call bloom_start(); select count(*) from t1; count(*) @@ -1643,6 +1647,7 @@ insert t1 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc" from seq_1_to_10000; insert t2 select * from t1; +set global rocksdb_force_flush_memtable_now=1; call bloom_start(); select count(*) from t1; count(*) diff --git a/storage/rocksdb/mysql-test/rocksdb/t/bloomfilter_load_select.inc b/storage/rocksdb/mysql-test/rocksdb/t/bloomfilter_load_select.inc index 5c122d6..cf8b268 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/bloomfilter_load_select.inc +++ b/storage/rocksdb/mysql-test/rocksdb/t/bloomfilter_load_select.inc @@ -5,6 +5,7 @@ insert t1 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc" from seq_1_to_10000; insert t2 select * from t1; +set global rocksdb_force_flush_memtable_now=1; # BF conditions (prefix short(4B)|medium(20B)|long(240B)) #0 no eq condition (o, x, x) diff --git a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def index 212e09c..60f658e 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def +++ b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def @@ -68,7 +68,6 @@ rpl_row_triggers : Requires read-free slave. compact_deletes: MDEV-12663 : rocksdb.compact_deletes times out and causes other tests to fail blind_delete_without_tx_api: MDEV-12286: rocksdb.blind_delete_without_tx_api test fails information_schema: MDEV-14372: unstable testcase -bloomfilter: MDEV-14562 ## ## Tests that fail for some other reason

1 0

[Commits] 16a8a24: MDEV-14375: rocksdb.bulk_load_unsorted fails
by psergey＠askmonty.org 14 May '18

14 May '18

revision-id: 16a8a241c297a4ae683523e68518aa85a129daea parent(s): 7e7592ade5bec98e80fb9a4aa6f6ad75107b605f committer: Sergei Petrunia branch nick: 10.2-r11 timestamp: 2018-05-14 17:57:33 +0300 message: MDEV-14375: rocksdb.bulk_load_unsorted fails Down-scale the test by a factor of 2. --- .../rocksdb/include/bulk_load_unsorted.inc | 11 ++--- .../mysql-test/rocksdb/r/bulk_load_unsorted.result | 51 +++++++++------------- .../rocksdb/r/bulk_load_unsorted_rev.result | 51 +++++++++------------- 3 files changed, 46 insertions(+), 67 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc b/storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc index 151ec0c..5f80808 100644 --- a/storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc +++ b/storage/rocksdb/mysql-test/rocksdb/include/bulk_load_unsorted.inc @@ -84,7 +84,7 @@ perl; my $fn = $ENV{'ROCKSDB_INFILE'}; open(my $fh, '>', $fn) || die "perl open($fn): $!"; binmode $fh; -my $max = 5000000; +my $max = 2500000; my $sign = 1; for (my $ii = 0; $ii < $max; $ii++) { @@ -129,12 +129,9 @@ ANALYZE TABLE t1, t2, t3; SHOW TABLE STATUS WHERE name LIKE 't%'; # Make sure all the data is there. -select count(a) from t1; -select count(b) from t1; -select count(a) from t2; -select count(b) from t2; -select count(a) from t3; -select count(b) from t3; +select count(a),count(b) from t1; +select count(a),count(b) from t2; +select count(a),count(b) from t3; SELECT * FROM t1 FORCE INDEX (PRIMARY) LIMIT 3; SELECT * FROM t2 FORCE INDEX (PRIMARY) LIMIT 3; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result index 2adaba1..40274c3 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted.result @@ -75,9 +75,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3; set rocksdb_bulk_load=0; SHOW TABLE STATUS WHERE name LIKE 't%'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 ROCKSDB 10 Fixed 5000000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL -t2 ROCKSDB 10 Fixed 5000000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL -t3 ROCKSDB 10 Fixed 5000000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL partitioned +t1 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL +t2 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL +t3 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL partitioned ANALYZE TABLE t1, t2, t3; Table Op Msg_type Msg_text test.t1 analyze status OK @@ -85,36 +85,27 @@ test.t2 analyze status OK test.t3 analyze status OK SHOW TABLE STATUS WHERE name LIKE 't%'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 ROCKSDB 10 Fixed 5000000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL -t2 ROCKSDB 10 Fixed 5000000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL -t3 ROCKSDB 10 Fixed 5000000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL partitioned -select count(a) from t1; -count(a) -5000000 -select count(b) from t1; -count(b) -5000000 -select count(a) from t2; -count(a) -5000000 -select count(b) from t2; -count(b) -5000000 -select count(a) from t3; -count(a) -5000000 -select count(b) from t3; -count(b) -5000000 +t1 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL +t2 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL +t3 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL partitioned +select count(a),count(b) from t1; +count(a) count(b) +2500000 2500000 +select count(a),count(b) from t2; +count(a) count(b) +2500000 2500000 +select count(a),count(b) from t3; +count(a) count(b) +2500000 2500000 SELECT * FROM t1 FORCE INDEX (PRIMARY) LIMIT 3; a b --4999998 5000000 --4999996 4999998 --4999994 4999996 +-2499998 2500000 +-2499996 2499998 +-2499994 2499996 SELECT * FROM t2 FORCE INDEX (PRIMARY) LIMIT 3; a b -4999999 -4999997 -4999997 -4999995 -4999995 -4999993 +2499999 -2499997 +2499997 -2499995 +2499995 -2499993 disconnect other; DROP TABLE t1, t2, t3; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result index f828fa5..1aaac8e 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_unsorted_rev.result @@ -75,9 +75,9 @@ LOAD DATA INFILE <input_file> INTO TABLE t3; set rocksdb_bulk_load=0; SHOW TABLE STATUS WHERE name LIKE 't%'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 ROCKSDB 10 Fixed 5000000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL -t2 ROCKSDB 10 Fixed 5000000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL -t3 ROCKSDB 10 Fixed 5000000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL partitioned +t1 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL +t2 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL +t3 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL partitioned ANALYZE TABLE t1, t2, t3; Table Op Msg_type Msg_text test.t1 analyze status OK @@ -85,36 +85,27 @@ test.t2 analyze status OK test.t3 analyze status OK SHOW TABLE STATUS WHERE name LIKE 't%'; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 ROCKSDB 10 Fixed 5000000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL -t2 ROCKSDB 10 Fixed 5000000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL -t3 ROCKSDB 10 Fixed 5000000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL partitioned -select count(a) from t1; -count(a) -5000000 -select count(b) from t1; -count(b) -5000000 -select count(a) from t2; -count(a) -5000000 -select count(b) from t2; -count(b) -5000000 -select count(a) from t3; -count(a) -5000000 -select count(b) from t3; -count(b) -5000000 +t1 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL +t2 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL +t3 ROCKSDB 10 Fixed 2500000 # # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL partitioned +select count(a),count(b) from t1; +count(a) count(b) +2500000 2500000 +select count(a),count(b) from t2; +count(a) count(b) +2500000 2500000 +select count(a),count(b) from t3; +count(a) count(b) +2500000 2500000 SELECT * FROM t1 FORCE INDEX (PRIMARY) LIMIT 3; a b -4999999 -4999997 -4999997 -4999995 -4999995 -4999993 +2499999 -2499997 +2499997 -2499995 +2499995 -2499993 SELECT * FROM t2 FORCE INDEX (PRIMARY) LIMIT 3; a b --4999998 5000000 --4999996 4999998 --4999994 4999996 +-2499998 2500000 +-2499996 2499998 +-2499994 2499996 disconnect other; DROP TABLE t1, t2, t3;

1 0

[Commits] 7e7592a: MDEV-16154: Server crashes in in myrocks::ha_rocksdb::load_auto_incr_value_from_index
by psergey＠askmonty.org 14 May '18

14 May '18

revision-id: 7e7592ade5bec98e80fb9a4aa6f6ad75107b605f parent(s): 6c0f3dd3414a97266912651fb169f630a36f2659 committer: Sergei Petrunia branch nick: 10.2-r11 timestamp: 2018-05-14 15:59:51 +0300 message: MDEV-16154: Server crashes in in myrocks::ha_rocksdb::load_auto_incr_value_from_index Backport the fix from the upstream and add our testcase. Backported cset: commit 997a979bf5e2f75ab88781d9d3fd22dddc1fc21f Author: Manuel Ung <mung(a)fb.com> Date: Thu Feb 15 08:38:12 2018 -0800 Fix crashes in autoincrement code paths Summary: There are two issues related to autoincrement that can lead to crashes: 1. The max value for double/float type for autoincrement was not implemented in MyRocks, and can lead to assertions. The fix is to add them in. 2. If we try to set auto_increment via alter table on a table without an auto_increment column defined, we segfault because there is no index from which to read the last value. The fix is to perform a check to see if autoincrement exists before reading from index (similar to code ha_rocksdb::open). Fixes https://github.com/facebook/mysql-5.6/issues/792 Closes https://github.com/facebook/mysql-5.6/pull/794 Differential Revision: D6995096 Pulled By: lth fbshipit-source-id: 1130ce1 --- storage/rocksdb/ha_rocksdb.cc | 10 +++++++++- storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars.result | 10 ++++++++++ .../rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result | 7 +++++++ storage/rocksdb/mysql-test/rocksdb/t/autoinc_vars.test | 13 +++++++++++++ .../rocksdb/mysql-test/rocksdb/t/mariadb_port_fixes.test | 9 +++++++++ 5 files changed, 48 insertions(+), 1 deletion(-) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 46d9638..8d7809a 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -5088,6 +5088,12 @@ static ulonglong rdb_get_int_col_max_value(const Field *field) { case HA_KEYTYPE_LONGLONG: max_value = 0x7FFFFFFFFFFFFFFFULL; break; + case HA_KEYTYPE_FLOAT: + max_value = 0x1000000ULL; + break; + case HA_KEYTYPE_DOUBLE: + max_value = 0x20000000000000ULL; + break; default: abort(); } @@ -11734,7 +11740,9 @@ bool ha_rocksdb::prepare_inplace_alter_table( if (!new_tdef) { new_tdef = m_tbl_def; } - max_auto_incr = load_auto_incr_value_from_index(); + if (table->found_next_number_field) { + max_auto_incr = load_auto_incr_value_from_index(); + } } ha_alter_info->handler_ctx = new Rdb_inplace_alter_ctx( diff --git a/storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars.result b/storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars.result index 5da9a7e..8cc9b07 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/autoinc_vars.result @@ -140,3 +140,13 @@ SELECT * FROM t1; a b 18446744073709551613 a DROP TABLE t1; +#---------------------------------- +# Issue #792 Crash in autoincrement +#---------------------------------- +CREATE TABLE t1(C1 DOUBLE AUTO_INCREMENT KEY,C2 CHAR) ENGINE=ROCKSDB; +INSERT INTO t1 VALUES(2177,0); +DROP TABLE t1; +CREATE TABLE t0(c0 BLOB) ENGINE=ROCKSDB; +INSERT INTO t0 VALUES(0); +ALTER TABLE t0 AUTO_INCREMENT=0; +DROP TABLE t0; diff --git a/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result b/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result index 98c5ebe..eeb261d 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/mariadb_port_fixes.result @@ -89,3 +89,10 @@ CREATE TABLE t1 (i INT) ENGINE=RocksDB; FLUSH TABLE t1 FOR EXPORT; ERROR HY000: Storage engine ROCKSDB of the table `test`.`t1` doesn't have this option DROP TABLE t1; +# +# MDEV-16154 Server crashes in in myrocks::ha_rocksdb::load_auto_incr_value_from_inde +# +CREATE TABLE t1 (a INT) ENGINE=RocksDB; +INSERT INTO t1 VALUES (1); +ALTER TABLE t1 AUTO_INCREMENT 10; +DROP TABLE t1; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/autoinc_vars.test b/storage/rocksdb/mysql-test/rocksdb/t/autoinc_vars.test index b896859..9d7f036 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/autoinc_vars.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/autoinc_vars.test @@ -103,3 +103,16 @@ SHOW CREATE TABLE t1; INSERT INTO t1 VALUES (NULL, 'c'); SELECT * FROM t1; DROP TABLE t1; + +--echo #---------------------------------- +--echo # Issue #792 Crash in autoincrement +--echo #---------------------------------- + +CREATE TABLE t1(C1 DOUBLE AUTO_INCREMENT KEY,C2 CHAR) ENGINE=ROCKSDB; +INSERT INTO t1 VALUES(2177,0); +DROP TABLE t1; + +CREATE TABLE t0(c0 BLOB) ENGINE=ROCKSDB; +INSERT INTO t0 VALUES(0); +ALTER TABLE t0 AUTO_INCREMENT=0; +DROP TABLE t0; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/mariadb_port_fixes.test b/storage/rocksdb/mysql-test/rocksdb/t/mariadb_port_fixes.test index 681e3d2..a48c8a5 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/mariadb_port_fixes.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/mariadb_port_fixes.test @@ -83,3 +83,12 @@ CREATE TABLE t1 (i INT) ENGINE=RocksDB; FLUSH TABLE t1 FOR EXPORT; DROP TABLE t1; +--echo # +--echo # MDEV-16154 Server crashes in in myrocks::ha_rocksdb::load_auto_incr_value_from_inde +--echo # +CREATE TABLE t1 (a INT) ENGINE=RocksDB; +INSERT INTO t1 VALUES (1); +ALTER TABLE t1 AUTO_INCREMENT 10; + +DROP TABLE t1; +

1 0

[Commits] bc59bf68656: Fix merge error.
by jan 14 May '18

14 May '18

revision-id: bc59bf686560374585ac9142bda733b90a82ae16 (mariadb-10.1.33-12-gbc59bf68656) parent(s): a64a8226851fbad856d14cf91e8a1ea1159ddfd9 author: Jan Lindström committer: Jan Lindström timestamp: 2018-05-14 15:29:13 +0300 message: Fix merge error. --- mysql-test/suite/sys_vars/r/sysvars_wsrep.result | 2 +- sql/sql_trigger.cc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result index db932ae8223..a9268a2e8f0 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result @@ -610,7 +610,7 @@ GLOBAL_VALUE_ORIGIN COMPILE-TIME DEFAULT_VALUE 0 VARIABLE_SCOPE SESSION VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Ensure "synchronous" read view before executing an operation of the type specified by bitmask: 1 - READ(includes SELECT, SHOW and BEGIN/START TRANSACTION); 2 - UPDATE and DELETE; 4 - INSERT and REPLACE +VARIABLE_COMMENT Ensure "synchronous" read view before executing an operation of the type specified by bitmask: 1 - READ(includes SELECT and BEGIN/START TRANSACTION); 2 - UPDATE and DELETE; 4 - INSERT and REPLACE; 8 - SHOW NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 15 NUMERIC_BLOCK_SIZE 1 diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 583c11ff4ee..e14d19c7369 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -504,7 +504,6 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) if (err_status) goto end; } - WSREP_TO_ISOLATION_BEGIN(WSREP_MYSQL_DB, NULL, NULL); /* We should have only one table in table list. */ DBUG_ASSERT(tables->next_global == 0);

1 0

[Commits] 7bc5acf68e4: MDEV-15576: Server crashed in Cached_item_str::cmp / sortcmp or Assertion `item->null_value' failed in Type_handler_temporal_result::make_sort_key upon SELECT with NULLIF and ROLLUP
by Oleksandr Byelkin 14 May '18

14 May '18

revision-id: 7bc5acf68e4908b2817c1decea8ee6210c01d91b (mariadb-10.3.6-175-g7bc5acf68e4) parent(s): 4a5e23e257e229b548599133dbed5162af9df6d9 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-05-14 13:29:20 +0200 message: MDEV-15576: Server crashed in Cached_item_str::cmp / sortcmp or Assertion `item->null_value' failed in Type_handler_temporal_result::make_sort_key upon SELECT with NULLIF and ROLLUP Fixed null_value processing and is_null() usage. --- mysql-test/main/olap.result | 14 ++++++++++++++ mysql-test/main/olap.test | 17 +++++++++++++++++ sql/item_cmpfunc.cc | 2 +- sql/item_func.h | 36 ++++++++++++++++++++++++++++-------- 4 files changed, 60 insertions(+), 9 deletions(-) diff --git a/mysql-test/main/olap.result b/mysql-test/main/olap.result index bcc96d4951d..6fdbe008016 100644 --- a/mysql-test/main/olap.result +++ b/mysql-test/main/olap.result @@ -816,3 +816,17 @@ a int(11) YES 0 b int(20) YES 0 DROP VIEW v1; DROP TABLE t1; +# +# MDEV-15576: Server crashed in Cached_item_str::cmp / sortcmp or +# Assertion `item->null_value' failed in +# Type_handler_temporal_result::make_sort_key upon SELECT with NULLIF +# and ROLLUP +# +CREATE TABLE t1 (i INT); +INSERT INTO t1 VALUES (1),(2); +SELECT NULLIF( CAST( 'foo' AS DATE ), NULL & 'bar' ) AS f FROM t1 GROUP BY f WITH ROLLUP; +f +NULL +NULL +DROP TABLE t1; +# End of 10.3 Tests diff --git a/mysql-test/main/olap.test b/mysql-test/main/olap.test index 3da08581a87..74dbe8ba10b 100644 --- a/mysql-test/main/olap.test +++ b/mysql-test/main/olap.test @@ -447,3 +447,20 @@ DESC v1; DROP VIEW v1; DROP TABLE t1; + +--echo # +--echo # MDEV-15576: Server crashed in Cached_item_str::cmp / sortcmp or +--echo # Assertion `item->null_value' failed in +--echo # Type_handler_temporal_result::make_sort_key upon SELECT with NULLIF +--echo # and ROLLUP +--echo # + +CREATE TABLE t1 (i INT); +INSERT INTO t1 VALUES (1),(2); +--disable_warnings +SELECT NULLIF( CAST( 'foo' AS DATE ), NULL & 'bar' ) AS f FROM t1 GROUP BY f WITH ROLLUP; +--enable_warnings +DROP TABLE t1; + + +--echo # End of 10.3 Tests diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index afa68fc5df3..76f4788c1cf 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -2832,7 +2832,7 @@ Item_func_nullif::time_op(MYSQL_TIME *ltime) bool Item_func_nullif::is_null() { - return (null_value= (!compare() ? 1 : args[2]->null_value)); + return (null_value= (!compare() ? 1 : args[2]->is_null())); } void Item_func_case::reorder_args(uint start) diff --git a/sql/item_func.h b/sql/item_func.h index 8504fe41f37..9544978eb31 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1615,13 +1615,35 @@ class Item_func_rollup_const :public Item_func { name= a->name; } - double val_real() { return args[0]->val_real(); } - longlong val_int() { return args[0]->val_int(); } - String *val_str(String *str) { return args[0]->val_str(str); } - my_decimal *val_decimal(my_decimal *dec) { return args[0]->val_decimal(dec); } + double val_real() + { + double res= args[0]->val_real(); + null_value= args[0]->null_value; + return res; + } + longlong val_int() + { + longlong res= args[0]->val_int(); + null_value= args[0]->null_value; + return res; + } + String *val_str(String *str) + { + String *res= args[0]->val_str(str); + null_value= args[0]->null_value; + return res; + } + my_decimal *val_decimal(my_decimal *dec) + { + my_decimal *res= args[0]->val_decimal(dec); + null_value= args[0]->null_value; + return res; + } bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate) { - return args[0]->get_date(ltime, fuzzydate); + bool rc= args[0]->get_date(ltime, fuzzydate); + null_value= args[0]->null_value; + return rc; } const char *func_name() const { return "rollup_const"; } bool const_item() const { return 0; } @@ -1630,9 +1652,7 @@ class Item_func_rollup_const :public Item_func { collation= args[0]->collation; max_length= args[0]->max_length; - decimals=args[0]->decimals; - /* The item could be a NULL constant. */ - null_value= args[0]->is_null(); + decimals=args[0]->decimals; } Item *get_copy(THD *thd) { return get_item_copy<Item_func_rollup_const>(thd, this); }

1 0

[Commits] 0488401b955: postreview fix
by Oleksandr Byelkin 14 May '18

14 May '18

revision-id: 0488401b955a3434ba9ca5450cd0095bd687d5c2 (mariadb-10.3.6-140-g0488401b955) parent(s): 25d6af49a3ab4a6680700bdc47b72c15ab25a78e author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-05-14 12:49:09 +0200 message: postreview fix --- sql/item_cmpfunc.cc | 2 +- sql/item_func.h | 34 ++++++++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 78a557f5a1b..4a4fd14c4cb 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -2829,7 +2829,7 @@ Item_func_nullif::time_op(MYSQL_TIME *ltime) bool Item_func_nullif::is_null() { - return (null_value= (!compare() ? 1 : args[2]->null_value)); + return (null_value= (!compare() ? 1 : args[2]->is_null())); } void Item_func_case::reorder_args(uint start) diff --git a/sql/item_func.h b/sql/item_func.h index c203a21cc2b..392987140f7 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1607,14 +1607,34 @@ class Item_func_rollup_const :public Item_func { name= a->name; } - double val_real() { return args[0]->val_real(); } - longlong val_int() { return args[0]->val_int(); } - String *val_str(String *str) { return args[0]->val_str(str); } - my_decimal *val_decimal(my_decimal *dec) { return args[0]->val_decimal(dec); } + double val_real() + { + double res= args[0]->val_real(); + null_value= args[0]->null_value; + return res; + } + longlong val_int() + { + longlong res= args[0]->val_int(); + null_value= args[0]->null_value; + return res; + } + String *val_str(String *str) + { + String *res= args[0]->val_str(str); + null_value= args[0]->null_value; + return res; + } + my_decimal *val_decimal(my_decimal *dec) + { + my_decimal *res= args[0]->val_decimal(dec); + null_value= args[0]->null_value; + return res; + } bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate) { bool rc= args[0]->get_date(ltime, fuzzydate); - null_value= rc; + null_value= args[0]->null_value; return rc; } const char *func_name() const { return "rollup_const"; } @@ -1624,9 +1644,7 @@ class Item_func_rollup_const :public Item_func { collation= args[0]->collation; max_length= args[0]->max_length; - decimals=args[0]->decimals; - /* The item could be a NULL constant. */ - null_value= args[0]->is_null(); + decimals=args[0]->decimals; } Item *get_copy(THD *thd) { return get_item_copy<Item_func_rollup_const>(thd, this); }

1 0

[Commits] a64a8226851: Merge remote-tracking branch 'origin/10.0-galera' into 10.1
by jan 14 May '18

14 May '18

revision-id: a64a8226851fbad856d14cf91e8a1ea1159ddfd9 (mariadb-10.1.33-11-ga64a8226851) parent(s): 3b99a274a845edddeb2234108d0978d57f447c3d 215d652c66474c4578b0476385d055e7feae2d3a author: Jan Lindström committer: Jan Lindström timestamp: 2018-05-14 13:18:17 +0300 message: Merge remote-tracking branch 'origin/10.0-galera' into 10.1 .gitignore | 1 + include/my_global.h | 2 + include/mysql/psi/mysql_socket.h | 6 + mysql-test/r/read_only_innodb.result | 8 -- mysql-test/suite/galera/disabled.def | 3 + .../suite/galera/galera_2nodes_as_master_slave.cnf | 83 ------------- .../galera_2nodes_as_master_with_repl_filter.cnf | 87 ------------- mysql-test/suite/galera/r/MW-416.result | 114 ++++++++++++++++++ mysql-test/suite/galera/r/galera#500.result | 10 ++ mysql-test/suite/galera/t/MW-416.test | 134 +++++++++++++++++++++ mysql-test/suite/galera/t/galera#500.test | 38 ++++++ .../suite/galera/t/galera_concurrent_ctas.test | 2 +- .../galera/t/galera_gcache_recover_manytrx.test | 13 +- .../suite/galera/t/galera_many_tables_pk.test | 4 +- .../r/galera_evs_suspect_timeout.result | 1 + .../t/galera_evs_suspect_timeout.test | 1 + mysql-test/suite/wsrep/r/variables.result | 7 ++ mysql-test/suite/wsrep/t/variables.test | 14 +++ mysql-test/t/read_only_innodb.test | 9 -- mysys/my_symlink.c | 2 +- scripts/wsrep_sst_common.sh | 40 ++++-- sql/log.cc | 8 +- sql/slave.cc | 2 +- sql/sql_class.h | 1 + sql/sql_parse.cc | 3 +- sql/sql_trigger.cc | 1 + sql/sys_vars.cc | 13 +- sql/wsrep_hton.cc | 36 ++++-- sql/wsrep_mysqld.cc | 56 +++++---- sql/wsrep_mysqld.h | 2 + sql/wsrep_priv.h | 2 +- storage/innobase/handler/ha_innodb.cc | 64 +++++----- storage/innobase/os/os0file.cc | 8 +- storage/maria/ma_control_file.c | 2 +- storage/maria/ma_loghandler.c | 6 +- storage/maria/ma_open.c | 8 +- storage/myisam/mi_open.c | 8 +- storage/xtradb/handler/ha_innodb.cc | 15 ++- storage/xtradb/os/os0file.cc | 10 +- support-files/mysql.server.sh | 1 - support-files/policy/selinux/mariadb-server.fc | 2 +- support-files/policy/selinux/mariadb-server.te | 2 +- support-files/wsrep.cnf.sh | 3 + 43 files changed, 525 insertions(+), 307 deletions(-) diff --cc .gitignore index c3c140bb99a,a328a85b8cc..45617838c87 --- a/.gitignore +++ b/.gitignore @@@ -120,11 -114,9 +120,12 @@@ scripts/myto scripts/wsrep_sst_common scripts/wsrep_sst_mysqldump scripts/wsrep_sst_rsync + scripts/wsrep_sst_rsync_wan +scripts/wsrep_sst_mariabackup scripts/wsrep_sst_xtrabackup scripts/wsrep_sst_xtrabackup-v2 +scripts/maria_add_gis_sp.sql +scripts/maria_add_gis_sp_bootstrap.sql sql-bench/bench-count-distinct sql-bench/bench-init.pl sql-bench/compare-results diff --cc mysql-test/suite/galera/disabled.def index 513f9ac2c88,fad1e69d4d7..397ad22dab8 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -23,7 -31,23 +23,10 @@@ galera_as_slave_replication_bundle : MD 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 +galera.MW-329 : wsrep_local_replays not stable +galera.MW-328A : have_deadlocks test not stable +query_cache : MDEV-15805 Test failure on galera.query_cache + MW-416 : MDEV-13549 Galera test failures + galera_wan : MDEV-13549 Galera test failures + MW-388 : MDEV-13549 Galera test failures diff --cc mysql-test/suite/galera/t/galera_concurrent_ctas.test index 6c4e8be68a7,8b9b461d0fd..13dc9fea079 --- a/mysql-test/suite/galera/t/galera_concurrent_ctas.test +++ b/mysql-test/suite/galera/t/galera_concurrent_ctas.test @@@ -44,9 -44,9 +44,9 @@@ while($run { --error 0,1 exec $MYSQL --user=root --host=127.0.0.1 --port=$NODE_MYPORT_1 test \ - < $MYSQLTEST_VARDIR/tmp/galera_concurrent.sql & \ - $MYSQL --user=root --host=127.0.0.1 --port=$NODE_MYPORT_2 test \ + < $MYSQLTEST_VARDIR/tmp/galera_concurrent.sql & \ + $MYSQL --user=root --host=127.0.0.1 --port=$NODE_MYPORT_2 test \ - < $MYSQLTEST_VARDIR/tmp/galera_concurrent.sql; + < $MYSQLTEST_VARDIR/tmp/galera_concurrent.sql; dec $run; } diff --cc scripts/wsrep_sst_common.sh index 47d9021fe55,d20e3bc36c9..54d8cfb9e8e --- a/scripts/wsrep_sst_common.sh +++ b/scripts/wsrep_sst_common.sh @@@ -126,17 -129,17 +133,28 @@@ don readonly WSREP_SST_OPT_BYPASS readonly WSREP_SST_OPT_BINLOG + if [ -n "${WSREP_SST_OPT_ADDR_PORT:-}" ]; then + if [ -n "${WSREP_SST_OPT_PORT:-}" ]; then + if [ "$WSREP_SST_OPT_PORT" != "$WSREP_SST_OPT_ADDR_PORT" ]; then + echo "WSREP_SST: [ERROR] port in --port=$WSREP_SST_OPT_PORT differs from port in --address=$WSREP_SST_OPT_ADDR" >&2 + exit 2 + fi + else + readonly WSREP_SST_OPT_PORT="$WSREP_SST_OPT_ADDR_PORT" + fi + fi + +if [ -n "${WSREP_SST_OPT_ADDR:-}" ]; then + if [ -n "${WSREP_SST_OPT_PORT:-}" ]; then + if [ -n "$WSREP_SST_OPT_ADDR_PORT" -a "$WSREP_SST_OPT_PORT" != "$WSREP_SST_OPT_ADDR_PORT" ]; then + wsrep_log_error "port in --port=$WSREP_SST_OPT_PORT differs from port in --address=$WSREP_SST_OPT_ADDR" + exit 2 + fi + else + readonly WSREP_SST_OPT_PORT="$WSREP_SST_OPT_ADDR_PORT" + fi +fi + # try to use my_print_defaults, mysql and mysqldump that come with the sources # (for MTR suite) SCRIPTS_DIR="$(cd $(dirname "$0"); pwd -P)" diff --cc sql/slave.cc index ed679dfdf80,3dee39ad65f..6fe6de6872a --- a/sql/slave.cc +++ b/sql/slave.cc @@@ -5126,9 -4948,9 +5126,9 @@@ err_during_init If slave stopped due to node going non primary, we set global flag to trigger automatic restart of slave when node joins back to cluster. */ - if (wsrep_node_dropped && wsrep_restart_slave) + if (WSREP_ON && wsrep_node_dropped && wsrep_restart_slave) { - if (wsrep_ready) + if (wsrep_ready_get()) { WSREP_INFO("Slave error due to node temporarily non-primary" "SQL slave will continue"); diff --cc sql/sql_parse.cc index f83e51409ab,c353c50d8c0..3e84efd407f --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@@ -3963,13 -3783,9 +3964,13 @@@ end_with_restore_list case SQLCOM_INSERT_SELECT: { WSREP_SYNC_WAIT(thd, WSREP_SYNC_WAIT_BEFORE_INSERT_REPLACE); - select_result *sel_result; + select_insert *sel_result; bool explain= MY_TEST(lex->describe); DBUG_ASSERT(first_table == all_tables && first_table != 0); + if (WSREP_CLIENT(thd) && + wsrep_sync_wait(thd, WSREP_SYNC_WAIT_BEFORE_INSERT_REPLACE)) + goto error; + if ((res= insert_precheck(thd, all_tables))) break; #ifdef WITH_WSREP diff --cc sql/sys_vars.cc index 9f87d66fef1,2348cb4d45d..cf5cfa8b9a4 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@@ -4891,12 -4642,11 +4891,19 @@@ static Sys_var_mybool Sys_wsrep_sst_don GLOBAL_VAR(wsrep_sst_donor_rejects_queries), CMD_LINE(OPT_ARG), DEFAULT(FALSE)); ++static bool wsrep_on_check_super(sys_var *self, THD* thd, set_var *var) ++{ ++ if (check_has_super(self, thd, var)) ++ return true; ++ return (wsrep_on_check(self, thd, var)); ++} ++ static Sys_var_mybool Sys_wsrep_on ( "wsrep_on", "To enable wsrep replication ", SESSION_VAR(wsrep_on), - CMD_LINE(OPT_ARG), DEFAULT(TRUE), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_has_super), + CMD_LINE(OPT_ARG), DEFAULT(FALSE), + NO_MUTEX_GUARD, NOT_IN_BINLOG, - ON_CHECK(wsrep_on_check), ++ ON_CHECK(wsrep_on_check_super), ON_UPDATE(wsrep_on_update)); static Sys_var_charptr Sys_wsrep_start_position ( @@@ -4942,9 -4690,9 +4949,9 @@@ static Sys_var_mybool Sys_wsrep_causal_ static Sys_var_uint Sys_wsrep_sync_wait( "wsrep_sync_wait", "Ensure \"synchronous\" read view before executing " "an operation of the type specified by bitmask: 1 - READ(includes " - "SELECT, SHOW and BEGIN/START TRANSACTION); 2 - UPDATE and DELETE; 4 - " - "INSERT and REPLACE", + "SELECT and BEGIN/START TRANSACTION); 2 - UPDATE and DELETE; 4 - " + "INSERT and REPLACE; 8 - SHOW", - SESSION_VAR(wsrep_sync_wait), CMD_LINE(OPT_ARG), + SESSION_VAR(wsrep_sync_wait), CMD_LINE(OPT_ARG, OPT_WSREP_SYNC_WAIT), VALID_RANGE(WSREP_SYNC_WAIT_NONE, WSREP_SYNC_WAIT_MAX), DEFAULT(WSREP_SYNC_WAIT_NONE), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), diff --cc sql/wsrep_mysqld.cc index 08a32f943f5,bd397a9a012..f1ea0a10e4f --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@@ -11,8 -11,9 +11,9 @@@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + #include <sql_plugin.h> // SHOW_MY_BOOL #include <mysqld.h> #include <sql_class.h> #include <sql_parse.h> @@@ -478,17 -413,8 +496,8 @@@ void wsrep_ready_wait ( static void wsrep_synced_cb(void* app_ctx) { WSREP_INFO("Synchronized with group, ready for connections"); - bool signal_main= false; - if (mysql_mutex_lock (&LOCK_wsrep_ready)) abort(); - if (!wsrep_ready) - { - wsrep_ready= TRUE; - mysql_cond_signal (&COND_wsrep_ready); - signal_main= true; - - } + my_bool signal_main= wsrep_ready_set(TRUE); - local_status.set(WSREP_MEMBER_SYNCED); + wsrep_config_state.set(WSREP_MEMBER_SYNCED); - mysql_mutex_unlock (&LOCK_wsrep_ready); if (signal_main) { @@@ -1007,17 -867,7 +1018,16 @@@ bool wsrep_sync_wait (THD* thd, uint ma return false; } +/* + * Helpers to deal with TOI key arrays + */ +typedef struct wsrep_key_arr +{ + wsrep_key_t* keys; + size_t keys_len; +} wsrep_key_arr_t; + - - static void wsrep_keys_free(wsrep_key_arr_t* key_arr) + void wsrep_keys_free(wsrep_key_arr_t* key_arr) { for (size_t i= 0; i < key_arr->keys_len; ++i) { @@@ -1814,9 -1681,9 +1824,9 @@@ wsrep_grant_mdl_exception(MDL_context * } else if (request_thd->lex->sql_command == SQLCOM_DROP_TABLE) { - WSREP_DEBUG("DROP caused BF abort"); + WSREP_DEBUG("DROP caused BF abort, conf %d", granted_thd->wsrep_conflict_state); ticket->wsrep_report(wsrep_debug); - mysql_mutex_unlock(&granted_thd->LOCK_wsrep_thd); + mysql_mutex_unlock(&granted_thd->LOCK_thd_data); wsrep_abort_thd((void*)request_thd, (void*)granted_thd, 1); ret = FALSE; } diff --cc sql/wsrep_mysqld.h index 57630ed8284,94c97f04aab..eeed9c6a297 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@@ -128,16 -139,12 +128,17 @@@ extern const char* wsrep_provider_name extern const char* wsrep_provider_version; extern const char* wsrep_provider_vendor; -int wsrep_show_status(THD *thd, SHOW_VAR *var, char *buff); +int wsrep_show_status(THD *thd, SHOW_VAR *var, char *buff, + enum enum_var_type scope); + int wsrep_show_ready(THD *thd, SHOW_VAR *var, char *buff); -void wsrep_free_status(THD *thd); - int wsrep_init(); void wsrep_deinit(bool free_options); + +/* Initialize wsrep thread LOCKs and CONDs */ +void wsrep_thr_init(); +/* Destroy wsrep thread LOCKs and CONDs */ +void wsrep_thr_deinit(); + void wsrep_recover(); bool wsrep_before_SE(); // initialize wsrep before storage // engines (true) or after (false) @@@ -234,8 -258,18 +235,9 @@@ extern wsrep_seqno_t wsrep_locked_seqno #define WSREP_QUERY(thd) (thd->query()) + extern my_bool wsrep_ready_get(); extern void wsrep_ready_wait(); -enum wsrep_trx_status { - WSREP_TRX_OK, - WSREP_TRX_CERT_FAIL, /* certification failure, must abort */ - WSREP_TRX_SIZE_EXCEEDED, /* trx size exceeded */ - WSREP_TRX_ERROR, /* native mysql error */ -}; - -extern enum wsrep_trx_status -wsrep_run_wsrep_commit(THD *thd, handlerton *hton, bool all); class Ha_trx_info; struct THD_TRANS; void wsrep_register_hton(THD* thd, bool all); diff --cc storage/innobase/handler/ha_innodb.cc index 961166fed9a,ec039915121..241d5e1ade9 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@@ -8436,14 -8005,12 +8440,14 @@@ report_error user_thd); #ifdef WITH_WSREP - if (!error_result && - wsrep_thd_exec_mode(user_thd) == LOCAL_STATE && - wsrep_on(user_thd) && - !wsrep_consistency_check(user_thd) && - !wsrep_thd_ignore_table(user_thd)) + if (!error_result + && wsrep_on(user_thd) + && wsrep_thd_exec_mode(user_thd) == LOCAL_STATE + && !wsrep_consistency_check(user_thd) - && !wsrep_thd_skip_append_keys(user_thd)) { - if (wsrep_append_keys(user_thd, false, record, NULL)) { ++ && !wsrep_thd_ignore_table(user_thd)) + { + if (wsrep_append_keys(user_thd, false, record, NULL)) + { DBUG_PRINT("wsrep", ("row key failed")); error_result = HA_ERR_INTERNAL_ERROR; goto wsrep_error; @@@ -18609,14 -17687,15 +18613,16 @@@ wsrep_innobase_kill_one_trx WSREP_LOG_CONFLICT(bf_thd, thd, TRUE); - WSREP_DEBUG("BF kill (%lu, seqno: %lld), victim: (%lu) trx: %lu", + WSREP_DEBUG("BF kill (%lu, seqno: %lld), victim: (%lu) trx: " + TRX_ID_FMT, signal, (long long)bf_seqno, - wsrep_thd_thread_id(thd), + thd_get_thread_id(thd), victim_trx->id); - WSREP_DEBUG("Aborting query: %s", - (thd && wsrep_thd_query(thd)) ? wsrep_thd_query(thd) : "void"); + WSREP_DEBUG("Aborting query: %s conf %d trx: %lu", + (thd && wsrep_thd_query(thd)) ? wsrep_thd_query(thd) : "void", - wsrep_thd_conflict_state(thd), ++ wsrep_thd_get_conflict_state(thd), + wsrep_thd_ws_handle(thd)->trx_id); wsrep_thd_LOCK(thd); DBUG_EXECUTE_IF("sync.wsrep_after_BF_victim_lock", @@@ -18676,10 -17754,9 +18682,10 @@@ wsrep_abort_slave_trx(bf_seqno, wsrep_thd_trx_seqno(thd)); } else { + wsrep_t *wsrep= get_wsrep(); rcode = wsrep->abort_pre_commit( wsrep, bf_seqno, - (wsrep_trx_id_t)victim_trx->id + (wsrep_trx_id_t)wsrep_thd_ws_handle(thd)->trx_id ); switch (rcode) { @@@ -18802,12 -17894,14 +18808,14 @@@ wsrep_abort_transaction my_bool signal) { DBUG_ENTER("wsrep_innobase_abort_thd"); - trx_t* victim_trx = thd_to_trx(victim_thd); - trx_t* bf_trx = (bf_thd) ? thd_to_trx(bf_thd) : NULL; + + trx_t* victim_trx = thd_to_trx(victim_thd); + trx_t* bf_trx = (bf_thd) ? thd_to_trx(bf_thd) : NULL; - WSREP_DEBUG("abort transaction: BF: %s victim: %s", - wsrep_thd_query(bf_thd), - wsrep_thd_query(victim_thd)); + WSREP_DEBUG("abort transaction: BF: %s victim: %s victim conf: %d", + wsrep_thd_query(bf_thd), + wsrep_thd_query(victim_thd), - wsrep_thd_conflict_state(victim_thd)); ++ wsrep_thd_get_conflict_state(victim_thd)); if (victim_trx) { lock_mutex_enter(); diff --cc storage/innobase/os/os0file.cc index 81614549702,d4b8e82b0d8..cf4645458cc --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@@ -1604,9 -1428,9 +1604,9 @@@ os_file_create_simple_no_error_handling return(file); } - file = open(name, create_flag, os_innodb_umask); - file.m_file = ::open(name, create_flag | O_CLOEXEC, os_innodb_umask); ++ file = open(name, create_flag | O_CLOEXEC, os_innodb_umask); - *success = file.m_file == -1 ? FALSE : TRUE; + *success = file != -1; /* This function is always called for data files, we should disable OS caching (O_DIRECT) here as we do in os_file_create_func(), so @@@ -1969,9 -1755,9 +1969,9 @@@ os_file_create_func #endif /* O_SYNC */ do { - file = open(name, create_flag, os_innodb_umask); - file.m_file = ::open(name, create_flag | O_CLOEXEC, os_innodb_umask); ++ file = open(name, create_flag | O_CLOEXEC, os_innodb_umask); - if (file.m_file == -1) { + if (file == -1) { const char* operation; operation = (create_mode == OS_FILE_CREATE diff --cc storage/xtradb/handler/ha_innodb.cc index 238627ce003,2548c821aac..290ff59d0ff --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@@ -9022,14 -8730,12 +9027,14 @@@ report_error user_thd); #ifdef WITH_WSREP - if (!error_result && - wsrep_thd_exec_mode(user_thd) == LOCAL_STATE && - wsrep_on(user_thd) && - !wsrep_consistency_check(user_thd) && - !wsrep_thd_ignore_table(user_thd)) + if (!error_result + && wsrep_on(user_thd) - && wsrep_thd_exec_mode(user_thd) == LOCAL_STATE ++ && wsrep_thd_exec_mode(user_thd) == LOCAL_STATE + && !wsrep_consistency_check(user_thd) - && !wsrep_thd_skip_append_keys(user_thd)) { - if (wsrep_append_keys(user_thd, false, record, NULL)) { ++ && !wsrep_thd_ignore_table(user_thd)) + { + if (wsrep_append_keys(user_thd, false, record, NULL)) + { DBUG_PRINT("wsrep", ("row key failed")); error_result = HA_ERR_INTERNAL_ERROR; goto wsrep_error; diff --cc storage/xtradb/os/os0file.cc index 6a63f31b37a,b4fafb127ec..7df42a37b4a --- a/storage/xtradb/os/os0file.cc +++ b/storage/xtradb/os/os0file.cc @@@ -1730,9 -1577,9 +1730,9 @@@ os_file_create_simple_no_error_handling return(file); } - file = open(name, create_flag, os_innodb_umask); - file.m_file = ::open(name, create_flag | O_CLOEXEC , os_innodb_umask); ++ file = open(name, create_flag | O_CLOEXEC, os_innodb_umask); - *success = file.m_file == -1 ? FALSE : TRUE; + *success = file != -1; /* This function is always called for data files, we should disable OS caching (O_DIRECT) here as we do in os_file_create_func(), so @@@ -2145,9 -1959,9 +2145,9 @@@ os_file_create_func #endif /* O_SYNC */ do { - file = open(name, create_flag, os_innodb_umask); - file.m_file = ::open(name, create_flag | O_CLOEXEC, os_innodb_umask); ++ file = open(name, create_flag | O_CLOEXEC, os_innodb_umask); - if (file.m_file == -1) { + if (file == -1) { const char* operation; operation = (create_mode == OS_FILE_CREATE

1 0

[Commits] 60448fa091b: MDEV-14695: Assertion `n < m_size' failed in Bounds_checked_array<Element_type>::operator
by varunraiko1803＠gmail.com 13 May '18

13 May '18

revision-id: 60448fa091b96715e43b3ef74a73c1bb4a6a201e (mariadb-10.2.5-636-g60448fa091b) parent(s): 8b26fea83572cf5c043721b7835c3828937f9c27 author: Varun Gupta committer: Varun Gupta timestamp: 2018-05-14 01:18:12 +0530 message: MDEV-14695: Assertion `n < m_size' failed in Bounds_checked_array<Element_type>::operator In this issue we hit the assert because we are adding addition fields to the field JOIN::all_fields list. This is done because HEAP tables can't index BIT fields so we need to use an additional hidden field for grouping because later it will be converted to a LONG field. Original field will remain of the BIT type and will be returned. This happens when we convert DISTINCT to GROUP BY. The solution is to take into account the number of such hidden fields that would be added to the field JOIN::all_fields list while calculating the size of the ref_pointer_array. --- mysql-test/r/distinct.result | 10 ++++++++++ mysql-test/t/distinct.test | 8 ++++++++ sql/sql_base.cc | 9 ++++++--- sql/sql_base.h | 4 ++-- sql/sql_delete.cc | 3 ++- sql/sql_lex.cc | 8 +++++++- sql/sql_lex.h | 5 +++++ sql/sql_select.cc | 4 +++- sql/sql_union.cc | 1 + 9 files changed, 44 insertions(+), 8 deletions(-) diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index 8d7074cd270..e1bbf5adb79 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -1039,4 +1039,14 @@ count(distinct case when id<=63 then id end) 63 drop table tb; SET @@tmp_table_size= @tmp_table_size_save; +# +# MDEV-14695: Assertion `n < m_size' failed in Bounds_checked_array<Element_type>::operator +# +CREATE TABLE t1 (b1 BIT, b2 BIT, b3 BIT, b4 BIT , b5 BIT, b6 BIT); +INSERT INTO t1 VALUES (1,0,0,1,0,1),(0,1,0,0,1,0); +SELECT DISTINCT b1+'0', b2+'0', b3+'0', b4+'0', b5+'0', b6 +'0' FROM t1; +b1+'0' b2+'0' b3+'0' b4+'0' b5+'0' b6 +'0' +1 0 0 1 0 1 +0 1 0 0 1 0 +DROP TABLE t1; End of 5.5 tests diff --git a/mysql-test/t/distinct.test b/mysql-test/t/distinct.test index 7cf3d6810bb..c11f8b501bc 100644 --- a/mysql-test/t/distinct.test +++ b/mysql-test/t/distinct.test @@ -790,4 +790,12 @@ drop table tb; SET @@tmp_table_size= @tmp_table_size_save; +--echo # +--echo # MDEV-14695: Assertion `n < m_size' failed in Bounds_checked_array<Element_type>::operator +--echo # + +CREATE TABLE t1 (b1 BIT, b2 BIT, b3 BIT, b4 BIT , b5 BIT, b6 BIT); +INSERT INTO t1 VALUES (1,0,0,1,0,1),(0,1,0,0,1,0); +SELECT DISTINCT b1+'0', b2+'0', b3+'0', b4+'0', b5+'0', b6 +'0' FROM t1; +DROP TABLE t1; --echo End of 5.5 tests diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 95ff41cb6f4..81ccfe5e514 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -6919,7 +6919,7 @@ static bool setup_natural_join_row_types(THD *thd, int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields, List<Item> *sum_func_list, - uint wild_num) + uint wild_num, uint *hidden_bit_flds) { if (!wild_num) return(0); @@ -6960,7 +6960,7 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields, else if (insert_fields(thd, ((Item_field*) item)->context, ((Item_field*) item)->db_name, ((Item_field*) item)->table_name, &it, - any_privileges)) + any_privileges, hidden_bit_flds)) { if (arena) thd->restore_active_arena(arena, &backup); @@ -7425,7 +7425,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table, bool insert_fields(THD *thd, Name_resolution_context *context, const char *db_name, const char *table_name, List_iterator<Item> *it, - bool any_privileges) + bool any_privileges, uint *hidden_bit_flds) { Field_iterator_table_ref field_iterator; bool found; @@ -7545,6 +7545,9 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name, else it->after(item); /* Add 'item' to the SELECT list. */ + if (item->type() == Item::FIELD_ITEM && item->field_type() == MYSQL_TYPE_BIT) + (*hidden_bit_flds)++; + #ifndef NO_EMBEDDED_ACCESS_CHECKS /* Set privilege information for the fields of newly created views. diff --git a/sql/sql_base.h b/sql/sql_base.h index d6063f1b771..8d0dcb2f197 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -154,11 +154,11 @@ bool fill_record_n_invoke_before_triggers(THD *thd, TABLE *table, enum trg_event_type event); bool insert_fields(THD *thd, Name_resolution_context *context, const char *db_name, const char *table_name, - List_iterator<Item> *it, bool any_privileges); + List_iterator<Item> *it, bool any_privileges, uint *hidden_bit_flds); void make_leaves_list(THD *thd, List<TABLE_LIST> &list, TABLE_LIST *tables, bool full_table_list, TABLE_LIST *boundary); int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields, - List<Item> *sum_func_list, uint wild_num); + List<Item> *sum_func_list, uint wild_num, uint * hidden_bit_flds); bool setup_fields(THD *thd, Ref_ptr_array ref_pointer_array, List<Item> &item, enum_mark_columns mark_used_columns, List<Item> *sum_func_list, List<Item> *pre_fix, diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 7b7a7e3f804..7bae7736cf3 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -760,7 +760,8 @@ l select_lex->leaf_tables, FALSE, DELETE_ACL, SELECT_ACL, TRUE)) DBUG_RETURN(TRUE); - if ((wild_num && setup_wild(thd, table_list, field_list, NULL, wild_num)) || + if ((wild_num && setup_wild(thd, table_list, field_list, NULL, wild_num, + &select_lex->hidden_bit_flds)) || setup_fields(thd, Ref_ptr_array(), field_list, MARK_COLUMNS_READ, NULL, NULL, 0) || setup_conds(thd, table_list, select_lex->leaf_tables, conds) || diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 3e36cac96b9..35feadbcacf 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2143,6 +2143,7 @@ void st_select_lex::init_query() m_agg_func_used= false; window_specs.empty(); window_funcs.empty(); + hidden_bit_flds= 0; } void st_select_lex::init_select() @@ -2673,6 +2674,10 @@ ulong st_select_lex::get_table_join_options() bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num) { + + if (!((options & SELECT_DISTINCT) && !group_list.elements)) + hidden_bit_flds= 0; + // find_order_in_list() may need some extra space, so multiply by two. order_group_num*= 2; @@ -2687,7 +2692,8 @@ bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num) select_n_reserved + select_n_having_items + select_n_where_fields + - order_group_num) * 5; + order_group_num + + hidden_bit_flds) * 5; if (!ref_pointer_array.is_null()) { /* diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 6d281930d1f..8283496604e 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -956,6 +956,11 @@ class st_select_lex: public st_select_lex_node /* it is for correct printing SELECT options */ thr_lock_type lock_type; + /* + it counts the number of bit fields in the SELECT list. These are used when DISTINCT is + converted to a GROUP BY involving BIT fields. + */ + uint hidden_bit_flds; void init_query(); void init_select(); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 4cd4754596b..83953661ce3 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -799,7 +799,9 @@ JOIN::prepare(TABLE_LIST *tables_init, select_lex != select_lex->master_unit()->global_parameters()) real_og_num+= select_lex->order_list.elements; - if (setup_wild(thd, tables_list, fields_list, &all_fields, wild_num)) + DBUG_ASSERT(select_lex->hidden_bit_flds == 0); + if (setup_wild(thd, tables_list, fields_list, &all_fields, wild_num, + &select_lex->hidden_bit_flds)) DBUG_RETURN(-1); if (select_lex->setup_ref_array(thd, real_og_num)) DBUG_RETURN(-1); diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 3fe8a24f8bd..42904e341b6 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -1474,6 +1474,7 @@ bool st_select_lex::cleanup() } inner_refs_list.empty(); exclude_from_table_unique_test= FALSE; + hidden_bit_flds= 0; DBUG_RETURN(error); }

1 0

[Commits] 4861977ce76: MDEV-14695: Assertion `n < m_size' failed in Bounds_checked_array<Element_type>::operator
by varunraiko1803＠gmail.com 12 May '18

12 May '18

revision-id: 4861977ce76761fefb9779a774984b6afa818f2e (mariadb-10.2.5-636-g4861977ce76) parent(s): 8b26fea83572cf5c043721b7835c3828937f9c27 author: Varun Gupta committer: Varun Gupta timestamp: 2018-05-13 00:09:15 +0530 message: MDEV-14695: Assertion `n < m_size' failed in Bounds_checked_array<Element_type>::operator In this issue we hit the assert because we are adding addition fields to the field JOIN::all_fields list. This is done because HEAP tables can't index BIT fields so we need to use an additional hidden field for grouping because later it will be converted to a LONG field. Original field will remain of the BIT type and will be returned. This happens when we convert DISTINCT to GROUP BY. The solution is to take into account the number of such hidden fields that would be added to the field JOIN::all_fields list while calculating the size of the ref_pointer_array. --- sql/sql_base.cc | 9 ++++++--- sql/sql_base.h | 4 ++-- sql/sql_delete.cc | 3 ++- sql/sql_lex.cc | 8 +++++++- sql/sql_lex.h | 5 +++++ sql/sql_select.cc | 4 +++- sql/sql_union.cc | 1 + 7 files changed, 26 insertions(+), 8 deletions(-) diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 95ff41cb6f4..81ccfe5e514 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -6919,7 +6919,7 @@ static bool setup_natural_join_row_types(THD *thd, int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields, List<Item> *sum_func_list, - uint wild_num) + uint wild_num, uint *hidden_bit_flds) { if (!wild_num) return(0); @@ -6960,7 +6960,7 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields, else if (insert_fields(thd, ((Item_field*) item)->context, ((Item_field*) item)->db_name, ((Item_field*) item)->table_name, &it, - any_privileges)) + any_privileges, hidden_bit_flds)) { if (arena) thd->restore_active_arena(arena, &backup); @@ -7425,7 +7425,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table, bool insert_fields(THD *thd, Name_resolution_context *context, const char *db_name, const char *table_name, List_iterator<Item> *it, - bool any_privileges) + bool any_privileges, uint *hidden_bit_flds) { Field_iterator_table_ref field_iterator; bool found; @@ -7545,6 +7545,9 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name, else it->after(item); /* Add 'item' to the SELECT list. */ + if (item->type() == Item::FIELD_ITEM && item->field_type() == MYSQL_TYPE_BIT) + (*hidden_bit_flds)++; + #ifndef NO_EMBEDDED_ACCESS_CHECKS /* Set privilege information for the fields of newly created views. diff --git a/sql/sql_base.h b/sql/sql_base.h index d6063f1b771..8d0dcb2f197 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -154,11 +154,11 @@ bool fill_record_n_invoke_before_triggers(THD *thd, TABLE *table, enum trg_event_type event); bool insert_fields(THD *thd, Name_resolution_context *context, const char *db_name, const char *table_name, - List_iterator<Item> *it, bool any_privileges); + List_iterator<Item> *it, bool any_privileges, uint *hidden_bit_flds); void make_leaves_list(THD *thd, List<TABLE_LIST> &list, TABLE_LIST *tables, bool full_table_list, TABLE_LIST *boundary); int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields, - List<Item> *sum_func_list, uint wild_num); + List<Item> *sum_func_list, uint wild_num, uint * hidden_bit_flds); bool setup_fields(THD *thd, Ref_ptr_array ref_pointer_array, List<Item> &item, enum_mark_columns mark_used_columns, List<Item> *sum_func_list, List<Item> *pre_fix, diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 7b7a7e3f804..7bae7736cf3 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -760,7 +760,8 @@ l select_lex->leaf_tables, FALSE, DELETE_ACL, SELECT_ACL, TRUE)) DBUG_RETURN(TRUE); - if ((wild_num && setup_wild(thd, table_list, field_list, NULL, wild_num)) || + if ((wild_num && setup_wild(thd, table_list, field_list, NULL, wild_num, + &select_lex->hidden_bit_flds)) || setup_fields(thd, Ref_ptr_array(), field_list, MARK_COLUMNS_READ, NULL, NULL, 0) || setup_conds(thd, table_list, select_lex->leaf_tables, conds) || diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 3e36cac96b9..49150c863fe 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2143,6 +2143,7 @@ void st_select_lex::init_query() m_agg_func_used= false; window_specs.empty(); window_funcs.empty(); + hidden_bit_flds= 0; } void st_select_lex::init_select() @@ -2673,6 +2674,10 @@ ulong st_select_lex::get_table_join_options() bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num) { + + if (!((options & SELECT_DISTINCT) && !group_list)) + hidden_bit_flds= 0; + // find_order_in_list() may need some extra space, so multiply by two. order_group_num*= 2; @@ -2687,7 +2692,8 @@ bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num) select_n_reserved + select_n_having_items + select_n_where_fields + - order_group_num) * 5; + order_group_num + + hidden_bit_flds) * 5; if (!ref_pointer_array.is_null()) { /* diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 6d281930d1f..8283496604e 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -956,6 +956,11 @@ class st_select_lex: public st_select_lex_node /* it is for correct printing SELECT options */ thr_lock_type lock_type; + /* + it counts the number of bit fields in the SELECT list. These are used when DISTINCT is + converted to a GROUP BY involving BIT fields. + */ + uint hidden_bit_flds; void init_query(); void init_select(); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 4cd4754596b..83953661ce3 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -799,7 +799,9 @@ JOIN::prepare(TABLE_LIST *tables_init, select_lex != select_lex->master_unit()->global_parameters()) real_og_num+= select_lex->order_list.elements; - if (setup_wild(thd, tables_list, fields_list, &all_fields, wild_num)) + DBUG_ASSERT(select_lex->hidden_bit_flds == 0); + if (setup_wild(thd, tables_list, fields_list, &all_fields, wild_num, + &select_lex->hidden_bit_flds)) DBUG_RETURN(-1); if (select_lex->setup_ref_array(thd, real_og_num)) DBUG_RETURN(-1); diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 3fe8a24f8bd..42904e341b6 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -1474,6 +1474,7 @@ bool st_select_lex::cleanup() } inner_refs_list.empty(); exclude_from_table_unique_test= FALSE; + hidden_bit_flds= 0; DBUG_RETURN(error); }

1 0