- commits - lists.mariadb.org

[Commits] 3a6283cb3cc: Fix out of array access.
by jan 06 Apr '18

06 Apr '18

revision-id: 3a6283cb3cc0d17a028cd962e308a6094e29516c (mariadb-10.1.32-24-g3a6283cb3cc) parent(s): afbd45a791a4a8cde19e0b3d5b883f79a2ccc305 author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-06 08:48:11 +0300 message: Fix out of array access. --- client/mysqltest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 77584e70afe..734b263df66 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1462,7 +1462,7 @@ void free_used_memory() dynstr_free(&(*q)->content); my_free((*q)); } - for (i= 0; i < 12; i++) + for (i= 0; i < 10; i++) { if (var_reg[i].alloced_len) my_free(var_reg[i].str_val);

1 0

[Commits] 867d65e: Another attempt to fix the problem of using VALUE instead of VALUES
by IgorBabaev 06 Apr '18

06 Apr '18

revision-id: 867d65ef78405ed3a7b3c8c71265a7c4a2b71726 (mariadb-10.3.5-107-g867d65e) parent(s): 6936857654df02555fec95259c46ab07e7591413 author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-05 19:15:49 -0700 message: Another attempt to fix the problem of using VALUE instead of VALUES in insert statements. --- sql/sql_lex.cc | 35 ++++++++++++++++++++--------------- sql/sql_priv.h | 3 ++- sql/sql_yacc.yy | 11 +++++++---- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index cc7cc8d..2765a46 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1341,6 +1341,8 @@ int MYSQLlex(YYSTYPE *yylval, THD *thd) token= lex_one_token(yylval, thd); lip->add_digest_token(token, yylval); + SELECT_LEX *curr_sel= thd->lex->current_select; + switch(token) { case WITH: /* @@ -1391,15 +1393,16 @@ int MYSQLlex(YYSTYPE *yylval, THD *thd) } break; case VALUES: - if (thd->lex->current_select && - thd->lex->current_select->parsing_place == BEFORE_OPT_FIELD_LIST) + if (curr_sel && + (curr_sel->parsing_place == BEFORE_OPT_LIST || + curr_sel->parsing_place == AFTER_LIST)) { - thd->lex->current_select->parsing_place= NO_MATTER; + curr_sel->parsing_place= NO_MATTER; break; } - if (thd->lex->current_select && - (thd->lex->current_select->parsing_place == IN_UPDATE_ON_DUP_KEY || - thd->lex->current_select->parsing_place == IN_PART_FUNC)) + if (curr_sel && + (curr_sel->parsing_place == IN_UPDATE_ON_DUP_KEY || + curr_sel->parsing_place == IN_PART_FUNC)) return VALUE_SYM; token= lex_one_token(yylval, thd); lip->add_digest_token(token, yylval); @@ -1415,32 +1418,34 @@ int MYSQLlex(YYSTYPE *yylval, THD *thd) return VALUES; } case VALUE_SYM: - if (thd->lex->current_select && - thd->lex->current_select->parsing_place == BEFORE_OPT_FIELD_LIST) + if (curr_sel && + (curr_sel->parsing_place == BEFORE_OPT_LIST || + curr_sel->parsing_place == AFTER_LIST)) { - thd->lex->current_select->parsing_place= NO_MATTER; + curr_sel->parsing_place= NO_MATTER; return VALUES; } break; case PARTITION_SYM: case SELECT_SYM: case UNION_SYM: - if (thd->lex->current_select && - thd->lex->current_select->parsing_place == BEFORE_OPT_FIELD_LIST) + if (curr_sel && + (curr_sel->parsing_place == BEFORE_OPT_LIST || + curr_sel->parsing_place == AFTER_LIST)) { - thd->lex->current_select->parsing_place= NO_MATTER; + curr_sel->parsing_place= NO_MATTER; } break; case left_paren: - if (!thd->lex->current_select || - thd->lex->current_select->parsing_place != BEFORE_OPT_FIELD_LIST) + if (!curr_sel || + curr_sel->parsing_place != BEFORE_OPT_LIST) return token; token= lex_one_token(yylval, thd); lip->add_digest_token(token, yylval); lip->lookahead_yylval= lip->yylval; lip->yylval= NULL; lip->lookahead_token= token; - thd->lex->current_select->parsing_place= NO_MATTER; + curr_sel->parsing_place= NO_MATTER; if (token == LIKE) return LEFT_PAREN_LIKE; if (token == WITH) diff --git a/sql/sql_priv.h b/sql/sql_priv.h index ef8cb39..4de8b8c 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -359,7 +359,8 @@ enum enum_parsing_place IN_ORDER_BY, IN_UPDATE_ON_DUP_KEY, IN_PART_FUNC, - BEFORE_OPT_FIELD_LIST, + BEFORE_OPT_LIST, + AFTER_LIST, PARSING_PLACE_SIZE /* always should be the last */ }; diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 6b47205..f231bfb 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2573,7 +2573,7 @@ create: lex->create_info.init(); if (lex->main_select_push()) MYSQL_YYABORT; - lex->current_select->parsing_place= BEFORE_OPT_FIELD_LIST; + lex->current_select->parsing_place= BEFORE_OPT_LIST; if (lex->set_command_with_check(SQLCOM_CREATE_TABLE, $2, $1 | $4)) MYSQL_YYABORT; } @@ -13390,7 +13390,7 @@ insert: if (Lex->main_select_push()) MYSQL_YYABORT; mysql_init_select(lex); - lex->current_select->parsing_place= BEFORE_OPT_FIELD_LIST; + lex->current_select->parsing_place= BEFORE_OPT_LIST; } insert_lock_option opt_ignore insert2 @@ -13415,7 +13415,7 @@ replace: if (Lex->main_select_push()) MYSQL_YYABORT; mysql_init_select(lex); - lex->current_select->parsing_place= BEFORE_OPT_FIELD_LIST; + lex->current_select->parsing_place= BEFORE_OPT_LIST; } replace_lock_option insert2 { @@ -13494,6 +13494,9 @@ insert_field_spec: insert_field_list: LEFT_PAREN_ALT opt_fields ')' + { + Lex->current_select->parsing_place= AFTER_LIST; + } ; opt_fields: @@ -15216,7 +15219,7 @@ with_clause: lex->curr_with_clause= with_clause; with_clause->add_to_list(Lex->with_clauses_list_last_next); if (lex->current_select && - lex->current_select->parsing_place == BEFORE_OPT_FIELD_LIST) + lex->current_select->parsing_place == BEFORE_OPT_LIST) lex->current_select->parsing_place= NO_MATTER; } with_list

1 0

[Commits] 6936857: Fixed a bug with select numbering.
by IgorBabaev 06 Apr '18

06 Apr '18

revision-id: 6936857654df02555fec95259c46ab07e7591413 (mariadb-10.3.5-106-g6936857) parent(s): 9751b597780f025636e85987cbbe279e3fce772d author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-05 17:12:11 -0700 message: Fixed a bug with select numbering. Fixed a bug in LEX::pop_new_select_and_wrap() that caused constructing invalid unit trees. --- mysql-test/main/cte_nonrecursive.result | 32 ++++++++++++++++---------------- sql/sql_lex.cc | 3 +-- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/mysql-test/main/cte_nonrecursive.result b/mysql-test/main/cte_nonrecursive.result index a1c4dca..89ffd94 100644 --- a/mysql-test/main/cte_nonrecursive.result +++ b/mysql-test/main/cte_nonrecursive.result @@ -151,8 +151,8 @@ with t as (select a from t1 where a<5) select * from t2 where c in (select a from t); id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t2 ALL NULL NULL NULL NULL 4 -1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1 -2 MATERIALIZED t1 ALL NULL NULL NULL NULL 8 Using where +1 PRIMARY <subquery3> eq_ref distinct_key distinct_key 4 func 1 +3 MATERIALIZED t1 ALL NULL NULL NULL NULL 8 Using where explain select * from t2 where c in (select a from (select a from t1 where a<5) as t); @@ -332,8 +332,8 @@ union select * from t where a >= 4; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 Using where -2 UNION t1 ALL NULL NULL NULL NULL 8 Using where -NULL UNION RESULT <union1,2> ALL NULL NULL NULL NULL NULL +3 UNION t1 ALL NULL NULL NULL NULL 8 Using where +NULL UNION RESULT <union1,3> ALL NULL NULL NULL NULL NULL explain select * from (select a from t1 where b >= 'c') as t where t.a < 2 @@ -461,10 +461,10 @@ t.c in (with t as (select * from t1 where t1.a<5) select t2.c from t2,t where t2.c=t.a); id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t2 ALL NULL NULL NULL NULL 4 Using where -1 PRIMARY <subquery3> eq_ref distinct_key distinct_key 4 func 1 +1 PRIMARY <subquery4> eq_ref distinct_key distinct_key 4 func 1 1 PRIMARY t1 ALL NULL NULL NULL NULL 8 Using where; Using join buffer (flat, BNL join) -3 MATERIALIZED t2 ALL NULL NULL NULL NULL 4 Using where -3 MATERIALIZED t1 ALL NULL NULL NULL NULL 8 Using where; Using join buffer (flat, BNL join) +4 MATERIALIZED t2 ALL NULL NULL NULL NULL 4 Using where +4 MATERIALIZED t1 ALL NULL NULL NULL NULL 8 Using where; Using join buffer (flat, BNL join) explain select t1.a,t1.b from t1, (select c from t2 where c >= 4) as t where t1.a=t.c and @@ -597,8 +597,8 @@ explain select * from v2; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t2 ALL NULL NULL NULL NULL 4 Using where -1 PRIMARY <derived3> ref key0 key0 5 test.t2.c 2 -3 DERIVED t1 ALL NULL NULL NULL NULL 8 Using where; Using temporary; Using filesort +1 PRIMARY <derived2> ref key0 key0 5 test.t2.c 2 +2 DERIVED t1 ALL NULL NULL NULL NULL 8 Using where; Using temporary; Using filesort # with clause in the specification of a view that whose definition # table alias for a with table create view v3 as @@ -1116,17 +1116,17 @@ select * from cte_e as cte_e1 where a > 1 union select * from cte_e as cte_e2; id select_type table type possible_keys key key_len ref rows filtered Extra -1 PRIMARY <derived2> ALL NULL NULL NULL NULL 14 100.00 Using where -2 DERIVED t1 ALL NULL NULL NULL NULL 7 100.00 Using where +1 PRIMARY <derived4> ALL NULL NULL NULL NULL 14 100.00 Using where +4 DERIVED t1 ALL NULL NULL NULL NULL 7 100.00 Using where 5 UNION t1 ALL NULL NULL NULL NULL 7 100.00 Using where -NULL UNION RESULT <union2,5> ALL NULL NULL NULL NULL NULL NULL -6 UNION <derived9> ALL NULL NULL NULL NULL 14 100.00 -9 DERIVED t1 ALL NULL NULL NULL NULL 7 100.00 Using where +NULL UNION RESULT <union4,5> ALL NULL NULL NULL NULL NULL NULL +6 UNION <derived11> ALL NULL NULL NULL NULL 14 100.00 +11 DERIVED t1 ALL NULL NULL NULL NULL 7 100.00 Using where 12 UNION t1 ALL NULL NULL NULL NULL 7 100.00 Using where -NULL UNION RESULT <union9,12> ALL NULL NULL NULL NULL NULL NULL +NULL UNION RESULT <union11,12> ALL NULL NULL NULL NULL NULL NULL NULL UNION RESULT <union1,6> ALL NULL NULL NULL NULL NULL NULL Warnings: -Note 1003 with cte_e as (with cte_o as (with cte_i as (/* select#4 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` < 7)/* select#3 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` > 1)/* select#2 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` < 3 and `test`.`t1`.`a` > 1 and `test`.`t1`.`a` < 7 and `test`.`t1`.`a` > 1 union /* select#5 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` > 4 and `test`.`t1`.`a` > 1 and `test`.`t1`.`a` < 7 and `test`.`t1`.`a` > 1)/* select#1 */ select `cte_e1`.`a` AS `a` from `cte_e` `cte_e1` where `cte_e1`.`a` > 1 union /* select#6 */ select `cte_e2`.`a` AS `a` from (with cte_o as (with cte_i as (/* select#11 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` < 7)/* select#10 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` > 1)/* select#9 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` < 3 and `test`.`t1`.`a` > 1 and `test`.`t1`.`a` < 7 union /* select#12 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` > 4 and `test`.`t1`.`a` > 1 and `test`.`t1`.`a` < 7) `cte_e2` +Note 1003 with cte_e as (with cte_o as (with cte_i as (select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` < 7)select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` > 1)select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` < 3 and `test`.`t1`.`a` > 1 and `test`.`t1`.`a` < 7 and `test`.`t1`.`a` > 1 union select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` > 4 and `test`.`t1`.`a` > 1 and `test`.`t1`.`a` < 7 and `test`.`t1`.`a` > 1)select `cte_e1`.`a` AS `a` from `cte_e` `cte_e1` where `cte_e1`.`a` > 1 union select `cte_e2`.`a` AS `a` from (with cte_o as (with cte_i as (select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` < 7)select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` > 1)select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` < 3 and `test`.`t1`.`a` > 1 and `test`.`t1`.`a` < 7 union select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` > 4 and ` test`.`t 1`.`a` > 1 and `test`.`t1`.`a` < 7) `cte_e2` drop table t1; # # MDEV-13753: embedded CTE in a VIEW created in prepared statement diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index e037f05..cc7cc8d 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -3687,8 +3687,6 @@ void LEX::fix_first_select_number() { if (sel->select_number < num) sel->select_number++; - if (sel->select_number > num) - sel->select_number--; } first->select_number= 1; } @@ -5556,6 +5554,7 @@ SELECT_LEX *LEX::pop_new_select_and_wrap() DBUG_RETURN(NULL); last->link_neighbour(sel); sel->set_linkage_and_distinct(op, ds); + sel->set_master_unit(last->master_unit()); DBUG_RETURN(sel); }

1 0

[Commits] 9751b59: Fixed a bug in lexer.
by IgorBabaev 05 Apr '18

05 Apr '18

revision-id: 9751b597780f025636e85987cbbe279e3fce772d (mariadb-10.3.5-105-g9751b59) parent(s): 14956c47ca5e87dbad37248c9db9df56c3f1df82 author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-05 11:54:03 -0700 message: Fixed a bug in lexer. --- mysql-test/main/derived.result | 2 +- sql/sql_lex.cc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mysql-test/main/derived.result b/mysql-test/main/derived.result index 0ca050a..ebbc08a 100644 --- a/mysql-test/main/derived.result +++ b/mysql-test/main/derived.result @@ -225,7 +225,7 @@ ERROR HY000: The target table t1 of the UPDATE is not updatable delete from (select * from t1); ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(select * from t1)' at line 1 insert into (select * from t1) values (5); -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'select * from t1) values (5)' at line 1 +ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '(select * from t1) values (5)' at line 1 drop table t1; create table t1 (E1 INTEGER UNSIGNED NOT NULL, E2 INTEGER UNSIGNED NOT NULL, E3 INTEGER UNSIGNED NOT NULL, PRIMARY KEY(E1) ); diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 35eafe3..e037f05 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1397,8 +1397,9 @@ int MYSQLlex(YYSTYPE *yylval, THD *thd) thd->lex->current_select->parsing_place= NO_MATTER; break; } - if (thd->lex->current_select->parsing_place == IN_UPDATE_ON_DUP_KEY || - thd->lex->current_select->parsing_place == IN_PART_FUNC) + if (thd->lex->current_select && + (thd->lex->current_select->parsing_place == IN_UPDATE_ON_DUP_KEY || + thd->lex->current_select->parsing_place == IN_PART_FUNC)) return VALUE_SYM; token= lex_one_token(yylval, thd); lip->add_digest_token(token, yylval);

1 0

[Commits] 6df2a27: Fixed parsing VALUE instead of VALUES in INSERT statements.
by IgorBabaev 05 Apr '18

05 Apr '18

revision-id: 6df2a2708492db3dac3b99d29e6e69403489b1c8 (mariadb-10.3.5-101-g6df2a27) parent(s): d2539febb7e50ab556d03fde239011924d088fa7 author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-05 10:44:56 -0700 message: Fixed parsing VALUE instead of VALUES in INSERT statements. --- sql/sql_lex.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index c51e7bb..e202ccb 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1413,6 +1413,14 @@ int MYSQLlex(YYSTYPE *yylval, THD *thd) lip->lookahead_token= token; return VALUES; } + case VALUE_SYM: + if (thd->lex->current_select && + thd->lex->current_select->parsing_place == BEFORE_OPT_FIELD_LIST) + { + thd->lex->current_select->parsing_place= NO_MATTER; + return VALUES; + } + break; case PARTITION_SYM: case SELECT_SYM: case UNION_SYM:

1 0

[Commits] 62aaabfe568: Merge branch '10.1' into bb-10.1-galera
by jan 05 Apr '18

05 Apr '18

revision-id: 62aaabfe56816af15f381d166173c276511d9080 (mariadb-10.1.32-23-g62aaabfe568) parent(s): 32b9e0dab7fbc6e9c24fa94266d02f2489207ceb afbd45a791a4a8cde19e0b3d5b883f79a2ccc305 author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-05 17:17:46 +0300 message: Merge branch '10.1' into bb-10.1-galera mysql-test/suite/galera/disabled.def | 1 - mysql-test/suite/galera/r/MW-284.result | 3 +++ mysql-test/suite/galera/t/MW-284.test | 9 ++++++++- sql/sql_parse.cc | 6 ++++-- 4 files changed, 15 insertions(+), 4 deletions(-)

1 0

[Commits] 9c810ff82fd: Merge branch '10.1' of github.com:MariaDB/server into 10.1
by jan 05 Apr '18

05 Apr '18

revision-id: 9c810ff82fd48390f2d014e3dbf6907a38d2eb82 (mariadb-10.1.32-23-g9c810ff82fd) parent(s): 32b9e0dab7fbc6e9c24fa94266d02f2489207ceb e2e1483dd2e7b2b038a862a1f52d6ed220ef348d author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-05 17:15:02 +0300 message: Merge branch '10.1' of github.com:MariaDB/server into 10.1 mysql-test/suite/galera/disabled.def | 1 - mysql-test/suite/galera/r/MW-284.result | 3 +++ mysql-test/suite/galera/t/MW-284.test | 9 ++++++++- sql/sql_parse.cc | 6 ++++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index 8024d9cd452,76e6d588be3..96cafe25fba --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -24,7 -25,23 +24,6 @@@ galera_gcache_recover : MDEV-13549 Gale 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_wsrep_desync_wsrep_on : MDEV-13549 Galera test failures galera_ssl_upgrade : MDEV-13549 Galera test failures - MW-284 : MDEV-13549 Galera test failures 10.1 -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_pc_ignore_sb : MDEV-13549 Galera test failures 10.1 -galera_lock_table : MDEV-13549 Galera test failures 10.1 -galera_gtid : MDEV-13549 Galera test failures 10.1 -galera_unicode_identifiers : MDEV-13549 Galera test failures 10.1 -galera.galera_gcs_fc_limit : MDEV-13549 Galera test failures 10.1 galera.MW-329 : wsrep_local_replays not stable galera.MW-328A : have_deadlocks test not stable

1 0

[Commits] 0d614b7c636: Merge branch 'codership-MDEV-13549-fixes-for-MW-284' into 10.1
by jan 05 Apr '18

05 Apr '18

revision-id: 0d614b7c6369dfcda974e9322bc5b15203a49663 (mariadb-10.1.32-23-g0d614b7c636) parent(s): 32b9e0dab7fbc6e9c24fa94266d02f2489207ceb 9290c045501aaa017fd56ed3949382f21d260f06 author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-05 17:13:19 +0300 message: Merge branch 'codership-MDEV-13549-fixes-for-MW-284' into 10.1 mysql-test/suite/galera/disabled.def | 1 - mysql-test/suite/galera/r/MW-284.result | 1 + mysql-test/suite/galera/t/MW-284.test | 4 +++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --cc mysql-test/suite/galera/disabled.def index 8024d9cd452,9f6f4c77fde..96cafe25fba --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@@ -24,7 -25,24 +24,6 @@@ galera_gcache_recover : MDEV-13549 Gale 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_wsrep_desync_wsrep_on : MDEV-13549 Galera test failures galera_ssl_upgrade : MDEV-13549 Galera test failures - MW-284 : MDEV-13549 Galera test failures 10.1 -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_pc_ignore_sb : MDEV-13549 Galera test failures 10.1 -galera_lock_table : MDEV-13549 Galera test failures 10.1 -galera_gtid : MDEV-13549 Galera test failures 10.1 -galera_unicode_identifiers : MDEV-13549 Galera test failures 10.1 -galera.galera_gcs_fc_limit : MDEV-13549 Galera test failures 10.1 galera.MW-329 : wsrep_local_replays not stable galera.MW-328A : have_deadlocks test not stable

1 0

[Commits] 32b9e0dab7f: MDEV-13549: Galera test failures
by jan 05 Apr '18

05 Apr '18

revision-id: 32b9e0dab7fbc6e9c24fa94266d02f2489207ceb (mariadb-10.1.32-22-g32b9e0dab7f) parent(s): 257524293908f8de49b6160f05a78705da5846a9 author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-05 15:23:13 +0300 message: MDEV-13549: Galera test failures Enable tests that pass on 10.1: galera_var_auto_inc_control_on galera_var_retry_autocommit pxc-421 lp1376747-2 lp1376747 galera_toi_ddl_nonconflicting galera_parallel_simple galera_admin galera_pc_ignore_sb galera_lock_table galera_unicode_identifiers galera.galera_gcs_fc_limit galera.galera_gtid --- mysql-test/suite/galera/disabled.def | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 407961fe1c4..8024d9cd452 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -25,19 +25,6 @@ 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 galera_ssl_upgrade : MDEV-13549 Galera test failures -galera_var_auto_inc_control_on : 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_pc_ignore_sb : MDEV-13549 Galera test failures 10.1 -galera_lock_table : MDEV-13549 Galera test failures 10.1 MW-284 : MDEV-13549 Galera test failures 10.1 -galera_gtid : MDEV-13549 Galera test failures 10.1 -galera_unicode_identifiers : MDEV-13549 Galera test failures 10.1 -galera.galera_gcs_fc_limit : MDEV-13549 Galera test failures 10.1 galera.MW-329 : wsrep_local_replays not stable galera.MW-328A : have_deadlocks test not stable

1 0

[Commits] 8c7e76ba278: MDEV-13549: Galera test failures
by jan 05 Apr '18

05 Apr '18

revision-id: 8c7e76ba278d1b483eff73c7f781a2d48fa6aa85 (mariadb-10.1.32-22-g8c7e76ba278) parent(s): 257524293908f8de49b6160f05a78705da5846a9 author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-05 15:18:30 +0300 message: MDEV-13549: Galera test failures Enable tests that pass on 10.1: galera_var_auto_inc_control_on galera_var_retry_autocommit pxc-421 lp1376747-2 lp1376747 galera_toi_ddl_nonconflicting galera_parallel_simple galera_admin galera_pc_ignore_sb galera_lock_table galera_unicode_identifiers galera.galera_gcs_fc_limit --- mysql-test/suite/galera/disabled.def | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 407961fe1c4..ae7ad0ce38e 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -25,19 +25,7 @@ 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 galera_ssl_upgrade : MDEV-13549 Galera test failures -galera_var_auto_inc_control_on : 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_pc_ignore_sb : MDEV-13549 Galera test failures 10.1 -galera_lock_table : MDEV-13549 Galera test failures 10.1 MW-284 : MDEV-13549 Galera test failures 10.1 galera_gtid : MDEV-13549 Galera test failures 10.1 -galera_unicode_identifiers : MDEV-13549 Galera test failures 10.1 -galera.galera_gcs_fc_limit : MDEV-13549 Galera test failures 10.1 galera.MW-329 : wsrep_local_replays not stable galera.MW-328A : have_deadlocks test not stable

1 0