- commits - lists.mariadb.org

[Commits] 48c3207570d: MDEV-6707: Wrong result (extra row) with group by, multi-part key
by varunraiko1803＠gmail.com 09 Apr '18

09 Apr '18

revision-id: 48c3207570d83468dd276110e7e8297708f8cbc9 (mariadb-5.5.56-198-g48c3207570d) parent(s): 3eb2a265eac53050089bc5d563e65161717a2983 author: Varun Gupta committer: Varun Gupta timestamp: 2018-04-09 22:28:36 +0530 message: MDEV-6707: Wrong result (extra row) with group by, multi-part key This case involves using a composite key,few parts of which are involved in GROUP BY and few in the MIN/MAX functions in the select list. Ranges are created in accordance with the where condition, so during the execution of such queries, we try to find a prefix using the fields involved in GROUP BY and we then check if this newly returned prefix lies within the range we had calculated earlier. For queries which use composite key, few parts of which are involved in GROUP BY and few in the MIN/MAX functtions in the select list, we try to find the prefix of the ranges by using the fields involved in the group by clause. We get extra rows in the output when we have same partial ranges created for the fields in the GROUP BY clause This issue can be fixed if we compare such partial ranges and don't lookup if we see the same prefix again. --- mysql-test/r/range.result | 30 +++++++++++++++++++++++++++ mysql-test/r/range_mrr_icp.result | 30 +++++++++++++++++++++++++++ mysql-test/t/range.test | 18 ++++++++++++++++ sql/opt_range.cc | 43 ++++++++++++++++++++++++++++++++++++--- sql/opt_range.h | 9 ++++++-- 5 files changed, 125 insertions(+), 5 deletions(-) diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result index 630a692cef6..859cc96af27 100644 --- a/mysql-test/r/range.result +++ b/mysql-test/r/range.result @@ -2144,3 +2144,33 @@ value1 1000685 12345 value1 1003560 12345 value1 1004807 12345 drop table t1; +# +# MDEV-6707: Wrong result (extra row) with group by, multi-part key +# +CREATE TABLE t1 (f1 INT, f2 VARCHAR(1), KEY(f2,f1)) ENGINE=InnoDB; +INSERT INTO t1 VALUES +(7,'v'),(0,'s'),(9,'l'),(4,'c'); +create table t2(a int); +insert into t2 values (0),(1),(2),(3),(4),(5),(6); +explain +SELECT MAX(f1), f2 FROM t1 WHERE f2 LIKE 'c%' AND f1 <> 9 GROUP BY f2; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 range f2 f2 9 NULL 2 Using where; Using index for group-by +SELECT MAX(f1), f2 FROM t1 WHERE f2 LIKE 'c%' AND f1 <> 9 GROUP BY f2; +MAX(f1) f2 +4 c +explain +select (SELECT MAX(f1) as MAXVAL FROM t1 WHERE f2 LIKE 'c%' AND f1 <> 9 GROUP BY f2 having maxval<100+t2.a) AS SUBQ from t2; +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY t2 ALL NULL NULL NULL NULL 7 +2 DEPENDENT SUBQUERY t1 range f2 f2 9 NULL 2 Using where; Using index for group-by +select (SELECT MAX(f1) as MAXVAL FROM t1 WHERE f2 LIKE 'c%' AND f1 <> 9 GROUP BY f2 having maxval<100+t2.a) AS SUBQ from t2; +SUBQ +4 +4 +4 +4 +4 +4 +4 +DROP TABLE t1,t2; diff --git a/mysql-test/r/range_mrr_icp.result b/mysql-test/r/range_mrr_icp.result index 3f5de5b0189..65ec548fa74 100644 --- a/mysql-test/r/range_mrr_icp.result +++ b/mysql-test/r/range_mrr_icp.result @@ -2146,4 +2146,34 @@ value1 1000685 12345 value1 1003560 12345 value1 1004807 12345 drop table t1; +# +# MDEV-6707: Wrong result (extra row) with group by, multi-part key +# +CREATE TABLE t1 (f1 INT, f2 VARCHAR(1), KEY(f2,f1)) ENGINE=InnoDB; +INSERT INTO t1 VALUES +(7,'v'),(0,'s'),(9,'l'),(4,'c'); +create table t2(a int); +insert into t2 values (0),(1),(2),(3),(4),(5),(6); +explain +SELECT MAX(f1), f2 FROM t1 WHERE f2 LIKE 'c%' AND f1 <> 9 GROUP BY f2; +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1 range f2 f2 9 NULL 2 Using where; Using index for group-by +SELECT MAX(f1), f2 FROM t1 WHERE f2 LIKE 'c%' AND f1 <> 9 GROUP BY f2; +MAX(f1) f2 +4 c +explain +select (SELECT MAX(f1) as MAXVAL FROM t1 WHERE f2 LIKE 'c%' AND f1 <> 9 GROUP BY f2 having maxval<100+t2.a) AS SUBQ from t2; +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY t2 ALL NULL NULL NULL NULL 7 +2 DEPENDENT SUBQUERY t1 range f2 f2 9 NULL 2 Using where; Using index for group-by +select (SELECT MAX(f1) as MAXVAL FROM t1 WHERE f2 LIKE 'c%' AND f1 <> 9 GROUP BY f2 having maxval<100+t2.a) AS SUBQ from t2; +SUBQ +4 +4 +4 +4 +4 +4 +4 +DROP TABLE t1,t2; set optimizer_switch=@mrr_icp_extra_tmp; diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test index 393ca68e945..21c581b24dd 100644 --- a/mysql-test/t/range.test +++ b/mysql-test/t/range.test @@ -1718,3 +1718,21 @@ where (key1varchar='value1' AND (key2int <=1 OR key2int > 1)); --echo # The following must show col1=12345 for all rows: select * from t1; drop table t1; + +--echo # +--echo # MDEV-6707: Wrong result (extra row) with group by, multi-part key +--echo # + +CREATE TABLE t1 (f1 INT, f2 VARCHAR(1), KEY(f2,f1)) ENGINE=InnoDB; +INSERT INTO t1 VALUES +(7,'v'),(0,'s'),(9,'l'),(4,'c'); +create table t2(a int); +insert into t2 values (0),(1),(2),(3),(4),(5),(6); + +explain +SELECT MAX(f1), f2 FROM t1 WHERE f2 LIKE 'c%' AND f1 <> 9 GROUP BY f2; +SELECT MAX(f1), f2 FROM t1 WHERE f2 LIKE 'c%' AND f1 <> 9 GROUP BY f2; +explain +select (SELECT MAX(f1) as MAXVAL FROM t1 WHERE f2 LIKE 'c%' AND f1 <> 9 GROUP BY f2 having maxval<100+t2.a) AS SUBQ from t2; +select (SELECT MAX(f1) as MAXVAL FROM t1 WHERE f2 LIKE 'c%' AND f1 <> 9 GROUP BY f2 having maxval<100+t2.a) AS SUBQ from t2; +DROP TABLE t1,t2; diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 04ab8415dfe..504ed2d63b6 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -11249,6 +11249,7 @@ int QUICK_RANGE_SELECT::get_next() @param prefix_length length of cur_prefix @param group_key_parts The number of key parts in the group prefix @param cur_prefix prefix of a key to be searched for + @param save_last_range INOUT Saving the last range we encountered Each subsequent call to the method retrieves the first record that has a prefix with length prefix_length and which is different from cur_prefix, @@ -11271,7 +11272,8 @@ int QUICK_RANGE_SELECT::get_next() int QUICK_RANGE_SELECT::get_next_prefix(uint prefix_length, uint group_key_parts, - uchar *cur_prefix) + uchar *cur_prefix, + QUICK_RANGE **save_last_range) { DBUG_ENTER("QUICK_RANGE_SELECT::get_next_prefix"); const key_part_map keypart_map= make_prev_keypart_map(group_key_parts); @@ -11303,6 +11305,39 @@ int QUICK_RANGE_SELECT::get_next_prefix(uint prefix_length, } last_range= *(cur_range++); + /* + While calculating these prefixes we might encounter a case where there + would be same partial ranges for multiple ranges. + An example would be + select max(key_part2), key_part1 from t1 where key_part1 ='c' AND key_part2 <> 9 group by key_part1; + so the ranges would be + (c,NULL) <= (key_part1,key_part2) <= (c,9) + (c,9) <= (key_part1,key_part2) <= (c,+infinity) + + In this case for calculating prefixes with the group by field we take up the + partial ranges involving field f2 those would be + c<= key_part2 <=c + c<= key_part2 <=c + + So we lookup rows with the same prefix in all such ranges and + then we check for the other part(in this case f1) in ALL the ranges. + So if a record lies in a range, then it would satisfy both the partial + ranges in this case and therefore there would be multiple outputs for + the same row. + For such cases we should calculate the prefix only when we have the next + partial range different from the previous one. + */ + + if (*save_last_range) + { + if (!key_tuple_cmp(key_part_info, (*save_last_range)->min_key, + last_range->min_key, prefix_length)) + { + last_range=NULL; + continue; + } + } + *save_last_range= last_range; key_range start_key, end_key; last_range->make_min_endpoint(&start_key, prefix_length, keypart_map); last_range->make_max_endpoint(&end_key, prefix_length, keypart_map); @@ -13315,7 +13350,7 @@ QUICK_GROUP_MIN_MAX_SELECT(TABLE *table, JOIN *join_arg, bool have_min_arg, seen_first_key(FALSE), doing_key_read(FALSE), min_max_arg_part(min_max_arg_part_arg), key_infix(key_infix_arg), key_infix_len(key_infix_len_arg), min_functions_it(NULL), max_functions_it(NULL), - is_index_scan(is_index_scan_arg) + is_index_scan(is_index_scan_arg), save_last_range(NULL) { head= table; index= use_index; @@ -13652,6 +13687,7 @@ int QUICK_GROUP_MIN_MAX_SELECT::reset(void) DBUG_RETURN(0); /* Save the prefix of the last group. */ key_copy(last_prefix, record, index_info, group_prefix_len); + save_last_range= NULL; DBUG_RETURN(0); } @@ -13968,7 +14004,8 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_prefix() uchar *cur_prefix= seen_first_key ? group_prefix : NULL; if ((result= quick_prefix_select->get_next_prefix(group_prefix_len, group_key_parts, - cur_prefix))) + cur_prefix, + &save_last_range))) DBUG_RETURN(result); seen_first_key= TRUE; } diff --git a/sql/opt_range.h b/sql/opt_range.h index b8b46ae5ab1..12c20b8ea45 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -477,7 +477,7 @@ class QUICK_RANGE_SELECT : public QUICK_SELECT_I int get_next(); void range_end(); int get_next_prefix(uint prefix_length, uint group_key_parts, - uchar *cur_prefix); + uchar *cur_prefix, QUICK_RANGE **save_last_range); bool reverse_sorted() { return 0; } bool unique_key_range(); int init_ror_merged_scan(bool reuse_handler, MEM_ROOT *alloc); @@ -916,7 +916,12 @@ class QUICK_GROUP_MIN_MAX_SELECT : public QUICK_SELECT_I Use index scan to get the next different key instead of jumping into it through index read */ - bool is_index_scan; + bool is_index_scan; + /* + Used to save a partial range, so that we can check for records in + different partial ranges. + */ + QUICK_RANGE *save_last_range; public: /* The following two members are public to allow easy access from

1 0

[Commits] 7e700bd: Fix ha_rocksdb::calc_eq_cond_len() to handle HA_READ_PREFIX_LAST_OR_PREV correctly
by psergey＠askmonty.org 09 Apr '18

09 Apr '18

revision-id: 7e700bd2a81ae4b37145f1c32bb0902c72856d2d parent(s): 8628c589f69aea164ec1865f52eb0f5bc5154ed8 committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-09 19:12:23 +0300 message: Fix ha_rocksdb::calc_eq_cond_len() to handle HA_READ_PREFIX_LAST_OR_PREV correctly This is Variant#2. - Undo Variant#1 - Instead, swap the range bounds if we are doing a reverse-ordered scan. --- sql/opt_range.cc | 4 ++-- storage/rocksdb/ha_rocksdb.cc | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sql/opt_range.cc b/sql/opt_range.cc index cc57469..bc047b2 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -11677,8 +11677,8 @@ int QUICK_SELECT_DESC::get_next() end_key.flag= (last_range->flag & NEAR_MAX ? HA_READ_BEFORE_KEY : HA_READ_AFTER_KEY); end_key.keypart_map= last_range->max_keypart_map; - result= file->prepare_range_scan((last_range->flag & NO_MIN_RANGE) ? NULL : &start_key, - (last_range->flag & NO_MAX_RANGE) ? NULL : &end_key); + result= file->prepare_range_scan((last_range->flag & NO_MIN_RANGE) ? NULL : &end_key, + (last_range->flag & NO_MAX_RANGE) ? NULL : &start_key); if (result) { DBUG_RETURN(result); diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 9d3d07e..5f19fac 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -7464,13 +7464,6 @@ int ha_rocksdb::calc_eq_cond_len(const Rdb_key_def &kd, */ return slice.size() - bytes_changed_by_succ; } - if (find_flag == HA_READ_PREFIX_LAST_OR_PREV) { - /* - We are interested in records with or without the specified prefix, so - the only limit is that records are from this index - */ - return Rdb_key_def::INDEX_NUMBER_SIZE; - } if (end_key) { *end_key_packed_size =

1 0

[Commits] e25dc4acce5: Fix main.parser post 10.1->10.2 merge
by vicentiu＠mariadb.org 09 Apr '18

09 Apr '18

revision-id: e25dc4acce5b51436ee5339e75e7481d1e9b2fbf (mariadb-10.2.14-31-ge25dc4acce5) parent(s): d4d03fd3d8861ce682fc1a31e0d0bf304abdc7c6 author: Vicențiu Ciorbaru committer: Vicențiu Ciorbaru timestamp: 2018-04-09 17:21:02 +0300 message: Fix main.parser post 10.1->10.2 merge The parser test was failing as the format for ER_UNKNOWN_SYSTEM_VARIABLE error changed to first require the string length, then the actual string. This was not visible in any previous versions. --- sql/sql_yacc.yy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 86867cae033..b2088b0e640 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -15176,7 +15176,7 @@ option_value_no_option_type: struct sys_var_with_base tmp= $4; if (tmp.var == trg_new_row_fake_var) { - my_error(ER_UNKNOWN_SYSTEM_VARIABLE, MYF(0), "NEW"); + my_error(ER_UNKNOWN_SYSTEM_VARIABLE, MYF(0), 3, "NEW"); MYSQL_YYABORT; } /* Lookup if necessary: must be a system variable. */

1 0

[Commits] 8ff897265a3: Update test cases post MDEV-10286
by vicentiu＠mariadb.org 09 Apr '18

09 Apr '18

revision-id: 8ff897265a32898dd533c8da504937872ffa3935 (mariadb-10.1.32-44-g8ff897265a3) parent(s): 803ded51484255aa0c3201aebecfe45e11482653 author: Vicențiu Ciorbaru committer: Vicențiu Ciorbaru timestamp: 2018-04-09 16:49:41 +0300 message: Update test cases post MDEV-10286 Table_open_cache gets adjusted on server startup to prevent an out of file descriptor error. However this means that when we reset its value to default, it does not get re-adjusted. This leads to the mtr consistency check to fail with different server status at the end of the test case as opposed to when it started. To fix the problem, do not make use of the DEFAULT keyword to set the variable back, instead save the value before any modifications and restore it from there. --- mysql-test/r/myisam.result | 3 ++- mysql-test/r/myisam_recover.result | 3 ++- mysql-test/r/variables.result | 3 ++- mysql-test/t/myisam.test | 3 ++- mysql-test/t/myisam_recover.test | 3 ++- mysql-test/t/variables.test | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 0f865c151fa..3af64bbd0de 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -1906,6 +1906,7 @@ DROP TABLE t1; # # BUG#48438 - crash with error in unioned query against merge table and view... # +SET @save_table_open_cache=@@table_open_cache; SET GLOBAL table_open_cache=10; CREATE TABLE t1(a INT); SELECT 1 FROM t1 AS a1, t1 AS a2, t1 AS a3, t1 AS a4, t1 AS a5, t1 AS a6, t1 AS a7, t1 AS a8, t1 AS a9, t1 AS a10, t1 AS a11 FOR UPDATE; @@ -1915,7 +1916,7 @@ WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1'; TABLE_ROWS DATA_LENGTH 0 0 DROP TABLE t1; -SET GLOBAL table_open_cache=DEFAULT; +SET GLOBAL table_open_cache=@save_table_open_cache; End of 5.0 tests create table t1 (a int not null, key `a` (a) key_block_size=1024); show create table t1; diff --git a/mysql-test/r/myisam_recover.result b/mysql-test/r/myisam_recover.result index 0829c1e8b82..6ae282cb2b6 100644 --- a/mysql-test/r/myisam_recover.result +++ b/mysql-test/r/myisam_recover.result @@ -18,6 +18,7 @@ call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:"); call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table"); call mtr.add_suppression(" '\..test.t1'"); +set @save_table_open_cache=@@table_open_cache; set global table_open_cache=256; set global table_definition_cache=400; drop procedure if exists p_create; @@ -102,7 +103,7 @@ prepare stmt from @drop_table_stmt; execute stmt; deallocate prepare stmt; set @@global.table_definition_cache=default; -set @@global.table_open_cache=default; +set @@global.table_open_cache=@save_table_open_cache; # # 18075170 - sql node restart required to avoid deadlock after # restore diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index a01c8f48a4d..df0d16237ac 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -568,6 +568,7 @@ set sql_safe_updates=1; set sql_select_limit=1; set sql_select_limit=default; set sql_warnings=1; +set @save_table_open_cache=@@table_open_cache; set global table_open_cache=100; set default_storage_engine=myisam; set global thread_cache_size=100; @@ -752,7 +753,7 @@ table_open_cache 10 SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'table_open_cache'; VARIABLE_NAME VARIABLE_VALUE TABLE_OPEN_CACHE 10 -SET GLOBAL table_open_cache=DEFAULT; +SET GLOBAL table_open_cache=@save_table_open_cache; set character_set_results=NULL; select ifnull(@@character_set_results,"really null"); ifnull(@@character_set_results,"really null") diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index 8c7ad012a65..cbf12d81cad 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -1216,13 +1216,14 @@ DROP TABLE t1; --echo # --echo # BUG#48438 - crash with error in unioned query against merge table and view... --echo # +SET @save_table_open_cache=@@table_open_cache; SET GLOBAL table_open_cache=10; CREATE TABLE t1(a INT); SELECT 1 FROM t1 AS a1, t1 AS a2, t1 AS a3, t1 AS a4, t1 AS a5, t1 AS a6, t1 AS a7, t1 AS a8, t1 AS a9, t1 AS a10, t1 AS a11 FOR UPDATE; SELECT TABLE_ROWS, DATA_LENGTH FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1'; DROP TABLE t1; -SET GLOBAL table_open_cache=DEFAULT; +SET GLOBAL table_open_cache=@save_table_open_cache; --echo End of 5.0 tests diff --git a/mysql-test/t/myisam_recover.test b/mysql-test/t/myisam_recover.test index 49fe9c33460..670dfd1aa49 100644 --- a/mysql-test/t/myisam_recover.test +++ b/mysql-test/t/myisam_recover.test @@ -24,6 +24,7 @@ call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:"); call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table"); call mtr.add_suppression(" '\..test.t1'"); +set @save_table_open_cache=@@table_open_cache; set global table_open_cache=256; set global table_definition_cache=400; --disable_warnings @@ -111,7 +112,7 @@ prepare stmt from @drop_table_stmt; execute stmt; deallocate prepare stmt; set @@global.table_definition_cache=default; -set @@global.table_open_cache=default; +set @@global.table_open_cache=@save_table_open_cache; disconnect con1; connection default; --enable_ps_protocol diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index 8f29528ac25..458327328e4 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -343,6 +343,7 @@ set sql_select_limit=1; # reset it, so later tests don't get confused set sql_select_limit=default; set sql_warnings=1; +set @save_table_open_cache=@@table_open_cache; set global table_open_cache=100; set default_storage_engine=myisam; set global thread_cache_size=100; @@ -502,7 +503,7 @@ SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'MYI SET GLOBAL table_open_cache=-1; SHOW VARIABLES LIKE 'table_open_cache'; SELECT * FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE 'table_open_cache'; -SET GLOBAL table_open_cache=DEFAULT; +SET GLOBAL table_open_cache=@save_table_open_cache; # # Bugs12363: character_set_results is nullable,

1 0

[Commits] 8628c58: Fix ha_rocksdb::calc_eq_cond_len() to handle HA_READ_PREFIX_LAST_OR_PREV correctly
by psergey＠askmonty.org 09 Apr '18

09 Apr '18

revision-id: 8628c589f69aea164ec1865f52eb0f5bc5154ed8 parent(s): e7efc793504c0cd9d8b6cf9198314ae9b3c58988 committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-09 15:27:35 +0300 message: Fix ha_rocksdb::calc_eq_cond_len() to handle HA_READ_PREFIX_LAST_OR_PREV correctly --- storage/rocksdb/ha_rocksdb.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 5f19fac..9d3d07e 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -7464,6 +7464,13 @@ int ha_rocksdb::calc_eq_cond_len(const Rdb_key_def &kd, */ return slice.size() - bytes_changed_by_succ; } + if (find_flag == HA_READ_PREFIX_LAST_OR_PREV) { + /* + We are interested in records with or without the specified prefix, so + the only limit is that records are from this index + */ + return Rdb_key_def::INDEX_NUMBER_SIZE; + } if (end_key) { *end_key_packed_size =

1 0

[Commits] 803ded51484: MDEV-13549: Galera test failures
by jan 09 Apr '18

09 Apr '18

revision-id: 803ded51484255aa0c3201aebecfe45e11482653 (mariadb-10.1.32-43-g803ded51484) parent(s): fe61e287e952e47c9a2c317790b8e9324c5051b6 author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-09 14:43:32 +0300 message: MDEV-13549: Galera test failures Disable occasionally failing test case galera.galera_var_slave_threads. --- mysql-test/suite/galera/disabled.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index f8929bbe65f..69b7e6bfde1 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -34,4 +34,4 @@ query_cache : MDEV-15805 Test failure on galera.query_cache galera.galera_gra_log : MDEV-15808 Test failure on galera.galera_gra_log galera.MW-44 : MDEV-15809 Test failure on galera.MW-44 galera.galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb - +galera.galera_var_slave_threads : MDEV-15785 Test failure on galera.galera_var_slave_threads

1 0

[Commits] 9bdea1a: Top nest_level for selects should be 0.
by IgorBabaev 09 Apr '18

09 Apr '18

revision-id: 9bdea1a93b5adbd74a4dd4ddb64e3061694b2c03 (mariadb-10.3.5-119-g9bdea1a) parent(s): fc989e35004dc084e9cd96a1424c4d10981263bb author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-09 00:16:59 -0700 message: Top nest_level for selects should be 0. --- mysql-test/main/brackets.result | 2 +- sql/sql_lex.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mysql-test/main/brackets.result b/mysql-test/main/brackets.result index 05fba4c..55e3ce4 100644 --- a/mysql-test/main/brackets.result +++ b/mysql-test/main/brackets.result @@ -111,4 +111,4 @@ NULL UNION RESULT <union3,6> ALL NULL NULL NULL NULL NULL NULL NULL UNION RESULT <union2,7> ALL NULL NULL NULL NULL NULL NULL NULL UNION RESULT <union1,8> ALL NULL NULL NULL NULL NULL NULL Warnings: -Note 1003 /* select#1/1 Filter Select: select `1` AS `1` */ select 1 AS `1` union /* select#8/1 */ select `__8`.`1` AS `1` from (/* select#2/2 Filter Select: select `1` AS `1` */ select 1 AS `1` union /* select#7/2 */ select `__7`.`1` AS `1` from (/* select#3/3 Filter Select: select `1` AS `1` */ select 1 AS `1` union /* select#6/3 */ select `__6`.`1` AS `1` from (/* select#4/4 Filter Select: select `1` AS `1` */ select 1 AS `1` union /* select#5/4 */ select 1 AS `1`) `__6`) `__7`) `__8` +Note 1003 /* select#1/0 Filter Select: select `1` AS `1` */ select 1 AS `1` union /* select#8/0 */ select `__8`.`1` AS `1` from (/* select#2/1 Filter Select: select `1` AS `1` */ select 1 AS `1` union /* select#7/1 */ select `__7`.`1` AS `1` from (/* select#3/2 Filter Select: select `1` AS `1` */ select 1 AS `1` union /* select#6/2 */ select `__6`.`1` AS `1` from (/* select#4/3 Filter Select: select `1` AS `1` */ select 1 AS `1` union /* select#5/3 */ select 1 AS `1`) `__6`) `__7`) `__8` diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 75059bc..0d39a4d 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -756,7 +756,7 @@ void LEX::start(THD *thd_arg) name= null_clex_str; event_parse_data= NULL; profile_options= PROFILE_NONE; - nest_level=0 ; + nest_level= 0; builtin_select.nest_level_base= &unit; allow_sum_func= 0; in_sum_func= NULL; @@ -7854,7 +7854,7 @@ bool st_select_lex::check_parameters(SELECT_LEX *main_select) if ((options & OPTION_INTO_CLAUSE) && (!parent_lex->selects_allow_into || next_select() != NULL || - nest_level != 1)) + nest_level != 0)) { my_error(ER_CANT_USE_OPTION_HERE, MYF(0), "INTO"); DBUG_RETURN(TRUE); @@ -7865,7 +7865,7 @@ bool st_select_lex::check_parameters(SELECT_LEX *main_select) if (!parent_lex->selects_allow_procedure || next_select() != NULL || this != master_unit()->first_select() || - nest_level != 1) + nest_level != 0) { my_error(ER_CANT_USE_OPTION_HERE, MYF(0), "PROCEDURE"); DBUG_RETURN(TRUE); @@ -7953,7 +7953,7 @@ bool st_select_lex_unit::check_parameters(SELECT_LEX *main_select) bool LEX::check_main_unit_semantics() { - if (unit.set_nest_level(1) || + if (unit.set_nest_level(0) || unit.check_parameters(first_select_lex())) return TRUE; return FALSE;

1 0

[Commits] fe61e287e95: MDEV-15810: Test failure on galera.lp1376747 and galera.lp1376747-2
by jan 09 Apr '18

09 Apr '18

revision-id: fe61e287e952e47c9a2c317790b8e9324c5051b6 (mariadb-10.1.32-42-gfe61e287e95) parent(s): 767d6ce38cafd735aa70fcd6d6e4fa682d5548af author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-09 07:49:00 +0300 message: MDEV-15810: Test failure on galera.lp1376747 and galera.lp1376747-2 Wait until create table is replicated before continuing. --- mysql-test/suite/galera/disabled.def | 2 -- mysql-test/suite/galera/r/lp1376747-2.result | 3 +++ mysql-test/suite/galera/r/lp1376747.result | 3 +++ mysql-test/suite/galera/t/lp1376747-2.test | 7 +++++++ mysql-test/suite/galera/t/lp1376747.test | 7 +++++++ 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 4861223ba4b..f8929bbe65f 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -33,7 +33,5 @@ pxc-421 : MDEV-15804 Test failure on galera.pxc-421 query_cache : MDEV-15805 Test failure on galera.query_cache galera.galera_gra_log : MDEV-15808 Test failure on galera.galera_gra_log galera.MW-44 : MDEV-15809 Test failure on galera.MW-44 -galera.lp1376747 : MDEV-15810 Test failure on galera.lp1376747 -galera.lp1376747-2 : MDEV-15810 Test failure on galera.lp1376747-2 galera.galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb diff --git a/mysql-test/suite/galera/r/lp1376747-2.result b/mysql-test/suite/galera/r/lp1376747-2.result index 3b8aee61ed2..0c91e10acd7 100644 --- a/mysql-test/suite/galera/r/lp1376747-2.result +++ b/mysql-test/suite/galera/r/lp1376747-2.result @@ -1,5 +1,8 @@ CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); +SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; +NAME +test/t1 FLUSH TABLES t1 FOR EXPORT; ALTER TABLE t1 ADD COLUMN f2 INTEGER; INSERT INTO t1 VALUES (2,3); diff --git a/mysql-test/suite/galera/r/lp1376747.result b/mysql-test/suite/galera/r/lp1376747.result index 4617d5952bb..ec6c4a6e6f4 100644 --- a/mysql-test/suite/galera/r/lp1376747.result +++ b/mysql-test/suite/galera/r/lp1376747.result @@ -1,5 +1,8 @@ CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); +SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; +NAME +test/t1 FLUSH TABLES t1 WITH READ LOCK; ALTER TABLE t1 ADD COLUMN f2 INTEGER; INSERT INTO t1 VALUES (2,3); diff --git a/mysql-test/suite/galera/t/lp1376747-2.test b/mysql-test/suite/galera/t/lp1376747-2.test index 360681d7674..c570dd7d143 100644 --- a/mysql-test/suite/galera/t/lp1376747-2.test +++ b/mysql-test/suite/galera/t/lp1376747-2.test @@ -5,6 +5,13 @@ CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); --connection node_2 + +# Wait until above DDL's are replicated +--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; +--source include/wait_condition.inc + +SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; + FLUSH TABLES t1 FOR EXPORT; --connection node_1 diff --git a/mysql-test/suite/galera/t/lp1376747.test b/mysql-test/suite/galera/t/lp1376747.test index 769bb665c77..7daa544686f 100644 --- a/mysql-test/suite/galera/t/lp1376747.test +++ b/mysql-test/suite/galera/t/lp1376747.test @@ -5,6 +5,13 @@ CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); --connection node_2 + +# Wait until above DDL's are replicated +--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; +--source include/wait_condition.inc + +SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; + FLUSH TABLES t1 WITH READ LOCK; --connection node_1

1 0

[Commits] 767d6ce38ca: MDEV-15807: Test failure on galera.galera_lock_table
by jan 09 Apr '18

09 Apr '18

revision-id: 767d6ce38cafd735aa70fcd6d6e4fa682d5548af (mariadb-10.1.32-41-g767d6ce38ca) parent(s): 8bb40f2404909fc9c8070008f8a6e86180f2d74b author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-09 07:28:13 +0300 message: MDEV-15807: Test failure on galera.galera_lock_table Wait until create tables are replicated to the slave before trying lock table. --- mysql-test/suite/galera/disabled.def | 1 - mysql-test/suite/galera/r/galera_lock_table.result | 4 ++++ mysql-test/suite/galera/t/galera_lock_table.test | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 13bb2d01ffb..4861223ba4b 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -31,7 +31,6 @@ galera_var_retry_autocommit : MDEV-15794 Test failure on galera.galera_var_retry galera_var_auto_inc_control_on : MDEV-15803 Test failure on galera.galera_var_auto_inc_control_on pxc-421 : MDEV-15804 Test failure on galera.pxc-421 query_cache : MDEV-15805 Test failure on galera.query_cache -galera.galera_lock_table : MDEV-15807 galera.galera_gra_log : MDEV-15808 Test failure on galera.galera_gra_log galera.MW-44 : MDEV-15809 Test failure on galera.MW-44 galera.lp1376747 : MDEV-15810 Test failure on galera.lp1376747 diff --git a/mysql-test/suite/galera/r/galera_lock_table.result b/mysql-test/suite/galera/r/galera_lock_table.result index 16e9037a4de..0d40ac16565 100644 --- a/mysql-test/suite/galera/r/galera_lock_table.result +++ b/mysql-test/suite/galera/r/galera_lock_table.result @@ -1,5 +1,9 @@ CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=InnoDB; +SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; +NAME +test/t1 +test/t2 LOCK TABLE t1 READ; INSERT INTO t1 VALUES (1); INSERT INTO t2 VALUES (1); diff --git a/mysql-test/suite/galera/t/galera_lock_table.test b/mysql-test/suite/galera/t/galera_lock_table.test index bd581842f6f..2745bfe5faf 100644 --- a/mysql-test/suite/galera/t/galera_lock_table.test +++ b/mysql-test/suite/galera/t/galera_lock_table.test @@ -12,6 +12,13 @@ CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t2 (id INT PRIMARY KEY) ENGINE=InnoDB; --connection node_2 + +# Wait until above DDL's are replicated +--let $wait_condition = SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; +--source include/wait_condition.inc + +SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; + LOCK TABLE t1 READ; --connection node_1

1 0

[Commits] e7efc79: Make rocksdb.information_schema test stable
by psergey＠askmonty.org 08 Apr '18

08 Apr '18

revision-id: e7efc793504c0cd9d8b6cf9198314ae9b3c58988 parent(s): 34ff2967c5896797174598ac8d70bf941f2eb3f4 committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-09 01:10:43 +0300 message: Make rocksdb.information_schema test stable --- storage/rocksdb/mysql-test/rocksdb/r/information_schema.result | 7 +++---- storage/rocksdb/mysql-test/rocksdb/t/information_schema.test | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/information_schema.result b/storage/rocksdb/mysql-test/rocksdb/r/information_schema.result index 6850d8d..aba14e3 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/information_schema.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/information_schema.result @@ -4,15 +4,14 @@ DROP TABLE IF EXISTS t3; SET GLOBAL ROCKSDB_PAUSE_BACKGROUND_WORK=1; create table t1 (a int) engine=rocksdb; drop table t1; -select * from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO; +select * from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO where type<>'DDL_DROP_INDEX_ONGOING'; TYPE NAME VALUE MAX_INDEX_ID MAX_INDEX_ID max_index_id CF_FLAGS 0 default [0] CF_FLAGS 1 __system__ [0] -DDL_DROP_INDEX_ONGOING cf_id:0,index_id:max_index_id -select count(*) from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO; +select count(*) from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO where type<>'DDL_DROP_INDEX_ONGOING'; count(*) -4 +3 SET GLOBAL ROCKSDB_PAUSE_BACKGROUND_WORK=0; select VALUE into @keysIn from INFORMATION_SCHEMA.ROCKSDB_COMPACTION_STATS where CF_NAME = 'default' and LEVEL = 'Sum' and TYPE = 'KeyIn'; CREATE TABLE t1 (i1 INT, i2 INT, PRIMARY KEY (i1)) ENGINE = ROCKSDB; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/information_schema.test b/storage/rocksdb/mysql-test/rocksdb/t/information_schema.test index 2ffc186..67dae5d 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/information_schema.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/information_schema.test @@ -19,8 +19,8 @@ drop table t1; --let $max_index_id = query_get_value(SELECT * from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO where type = 'MAX_INDEX_ID', VALUE, 1) --replace_result $max_index_id max_index_id -select * from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO; -select count(*) from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO; +select * from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO where type<>'DDL_DROP_INDEX_ONGOING'; +select count(*) from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO where type<>'DDL_DROP_INDEX_ONGOING'; SET GLOBAL ROCKSDB_PAUSE_BACKGROUND_WORK=0; select VALUE into @keysIn from INFORMATION_SCHEMA.ROCKSDB_COMPACTION_STATS where CF_NAME = 'default' and LEVEL = 'Sum' and TYPE = 'KeyIn';

1 0