- commits - lists.mariadb.org

[Commits] 959362c: Fix compilation on windows
by psergey＠askmonty.org 16 Apr '18

16 Apr '18

revision-id: 959362c0208c545af8047fa690a439c39290e138 parent(s): 40bed2d39e0409d3a1ff468f792ec00ae0c8e7df committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-16 21:09:14 +0300 message: Fix compilation on windows --- sql/mysqld.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/mysqld.h b/sql/mysqld.h index 912fe36..a2a97d0 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -209,7 +209,7 @@ extern int max_user_connections; extern volatile ulong cached_thread_count; extern ulong what_to_log,flush_time; extern ulong max_prepared_stmt_count, prepared_stmt_count; -extern ulong open_files_limit; +extern MYSQL_PLUGIN_IMPORT ulong open_files_limit; extern ulonglong binlog_cache_size, binlog_stmt_cache_size; extern ulonglong max_binlog_cache_size, max_binlog_stmt_cache_size; extern ulong max_binlog_size;

1 0

[Commits] [Commit] 90f6f65634a: MDEV-15889 Semisync ack thread hits an LOCK_plugin assert at shutdown
by andrei.elkin＠pp.inet.fi 16 Apr '18

16 Apr '18

Sergei, hello. Here is a patch for a different issue that the former MDEV-15796 shadowed. This time dependency between the plugin and not-plugin-anymore semisync plays at shutdown. I hope you'll find time to review. Many thanks! Andrei revision-id: 90f6f65634a3245290b473f2bb65810cb9f2f18b (mariadb-10.3.6-7-g90f6f65634a) parent(s): dbbe70e1cfe9d7635d9dba774a2c9dc61163b542 author: Andrei Elkin committer: Andrei Elkin timestamp: 2018-04-16 20:37:10 +0300 message: MDEV-15889 Semisync ack thread hits an LOCK_plugin assert at shutdown MDEV-13073 effectively made the master semisync component depending on the plugin one through instantiation of THD by its Ack thread. The thread therefore must be closing its resources prior to plugin_shutdown(), which was not the case. Fixed with implementing the requirement. --- sql/mysqld.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2db3bbe1bac..6e1a5997e15 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2240,14 +2240,14 @@ void clean_up(bool print_message) lex_free(); /* Free some memory */ item_create_cleanup(); tdc_start_shutdown(); +#ifdef HAVE_REPLICATION + semi_sync_master_deinit(); +#endif plugin_shutdown(); udf_free(); ha_end(); if (tc_log) tc_log->close(); -#ifdef HAVE_REPLICATION - semi_sync_master_deinit(); -#endif xid_cache_free(); tdc_deinit(); mdl_destroy();

1 0

[Commits] 90f6f65634a: MDEV-15889 Semisync ack thread hits an LOCK_plugin assert at shutdown
by andrei.elkin＠pp.inet.fi 16 Apr '18

16 Apr '18

revision-id: 90f6f65634a3245290b473f2bb65810cb9f2f18b (mariadb-10.3.6-7-g90f6f65634a) parent(s): dbbe70e1cfe9d7635d9dba774a2c9dc61163b542 author: Andrei Elkin committer: Andrei Elkin timestamp: 2018-04-16 20:37:10 +0300 message: MDEV-15889 Semisync ack thread hits an LOCK_plugin assert at shutdown MDEV-13073 effectively made the master semisync component depending on the plugin one through instantiation of THD by its Ack thread. The thread therefore must be closing its resources prior to plugin_shutdown(), which was not the case. Fixed with implementing the requirement. --- sql/mysqld.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2db3bbe1bac..6e1a5997e15 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2240,14 +2240,14 @@ void clean_up(bool print_message) lex_free(); /* Free some memory */ item_create_cleanup(); tdc_start_shutdown(); +#ifdef HAVE_REPLICATION + semi_sync_master_deinit(); +#endif plugin_shutdown(); udf_free(); ha_end(); if (tc_log) tc_log->close(); -#ifdef HAVE_REPLICATION - semi_sync_master_deinit(); -#endif xid_cache_free(); tdc_deinit(); mdl_destroy();

1 0

[Commits] e34d318: MDEV-15556 MariaDB crash with big_tables=1 and CTE
by IgorBabaev 16 Apr '18

16 Apr '18

revision-id: e34d3184fd02967616bb83904aa3c21977ce6205 (mariadb-10.2.14-51-ge34d318) parent(s): 612850782d6d8bbe44d2b153a045b9a8afc624ef author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-16 10:31:30 -0700 message: MDEV-15556 MariaDB crash with big_tables=1 and CTE This bug manifested itself when the optimizer chose an execution plan with an access of the recursive CTE in a recursive query by key and ARIA/MYISAM temporary tables were used to store recursive tables. The problem appeared due to passing an incorrect parameter to the call of instantiate_tmp_table() in the function With_element::instantiate_tmp_tables(). --- mysql-test/r/cte_recursive.result | 88 ++++++++++++++++++++++++++++++++++++++- mysql-test/t/cte_recursive.test | 66 ++++++++++++++++++++++++++++- sql/sql_cte.cc | 2 +- 3 files changed, 153 insertions(+), 3 deletions(-) diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/r/cte_recursive.result index 01443bb..e1a52be 100644 --- a/mysql-test/r/cte_recursive.result +++ b/mysql-test/r/cte_recursive.result @@ -3081,7 +3081,7 @@ a 130 set big_tables=default; # -# MDEV-1571: Setting user variable in recursive CTE +# MDEV-15571: using recursive cte with big_tables enabled # set big_tables=1; with recursive qn as @@ -3093,3 +3093,89 @@ select a*2000 from qn where a<10000000000000000000 select * from qn; ERROR 22003: BIGINT value is out of range in '`qn`.`a` * 2000' set big_tables=default; +# +# MDEV-15556: using recursive cte with big_tables enabled +# when recursive tables are accessed by key +# +SET big_tables=1; +CREATE TABLE t1 (id int, name char(10), leftpar int, rightpar int); +INSERT INTO t1 VALUES +(1, "A", 2, 3), (2, "LA", 4, 5), (4, "LLA", 6, 7), +(6, "LLLA", NULL, NULL), (7, "RLLA", NULL, NULL), (5, "RLA", 8, 9), +(8, "LRLA", NULL, NULL), (9, "RRLA", NULL, NULL), (3, "RA", 10, 11), +(10, "LRA", 12, 13), (11, "RRA", 14, 15), (15, "RRRA", NULL, NULL), +(16, "B", 17, 18), (17, "LB", NULL, NULL), (18, "RB", NULL, NULL); +CREATE TABLE t2 SELECT * FROM t1 ORDER BY rand(); +WITH RECURSIVE tree_of_a AS +(SELECT *, cast(id AS char(200)) AS path FROM t2 WHERE name="A" + UNION ALL +SELECT t2.*, concat(tree_of_a.path,",",t2.id) +FROM t2 JOIN tree_of_a ON t2.id=tree_of_a.leftpar +UNION ALL +SELECT t2.*, concat(tree_of_a.path,",",t2.id) +FROM t2 JOIN tree_of_a ON t2.id=tree_of_a.rightpar) +SELECT * FROM tree_of_a +ORDER BY path; +id name leftpar rightpar path +1 A 2 3 1 +2 LA 4 5 1,2 +4 LLA 6 7 1,2,4 +6 LLLA NULL NULL 1,2,4,6 +7 RLLA NULL NULL 1,2,4,7 +5 RLA 8 9 1,2,5 +8 LRLA NULL NULL 1,2,5,8 +9 RRLA NULL NULL 1,2,5,9 +3 RA 10 11 1,3 +10 LRA 12 13 1,3,10 +11 RRA 14 15 1,3,11 +15 RRRA NULL NULL 1,3,11,15 +EXPLAIN WITH RECURSIVE tree_of_a AS +(SELECT *, cast(id AS char(200)) AS path FROM t2 WHERE name="A" + UNION ALL +SELECT t2.*, concat(tree_of_a.path,",",t2.id) +FROM t2 JOIN tree_of_a ON t2.id=tree_of_a.leftpar +UNION ALL +SELECT t2.*, concat(tree_of_a.path,",",t2.id) +FROM t2 JOIN tree_of_a ON t2.id=tree_of_a.rightpar) +SELECT * FROM tree_of_a +ORDER BY path; +id select_type table type possible_keys key key_len ref rows Extra +1 PRIMARY <derived2> ALL NULL NULL NULL NULL 15 Using filesort +2 DERIVED t2 ALL NULL NULL NULL NULL 15 Using where +3 RECURSIVE UNION t2 ALL NULL NULL NULL NULL 15 Using where +3 RECURSIVE UNION <derived2> ref key0 key0 5 test.t2.id 2 +4 RECURSIVE UNION t2 ALL NULL NULL NULL NULL 15 Using where +4 RECURSIVE UNION <derived2> ref key0 key0 5 test.t2.id 2 +NULL UNION RESULT <union2,3,4> ALL NULL NULL NULL NULL NULL +DROP TABLE t1,t2; +SET big_tables=0; +# +# MDEV-15840: recursive tables are accessed by key +# (the same problem as for MDEV-15556) +# +CREATE TABLE t1 (p1 text,k2 int, p2 text, k1 int); +INSERT INTO t1 select seq, seq, seq, seq from seq_1_to_1000; +CREATE PROCEDURE getNums() +BEGIN +WITH RECURSIVE cte as +( +SELECT * FROM t1 +UNION +SELECT c.* FROM t1 c JOIN cte p ON c.p1 = p.p2 AND c.k2 = p.k1 +) +SELECT * FROM cte LIMIT 10; +END | +call getNums(); +p1 k2 p2 k1 +1 1 1 1 +2 2 2 2 +3 3 3 3 +4 4 4 4 +5 5 5 5 +6 6 6 6 +7 7 7 7 +8 8 8 8 +9 9 9 9 +10 10 10 10 +DROP PROCEDURE getNums; +DROP TABLE t1; diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/t/cte_recursive.test index 008c8ea..e3032fc 100644 --- a/mysql-test/t/cte_recursive.test +++ b/mysql-test/t/cte_recursive.test @@ -2111,7 +2111,7 @@ select * from qn; set big_tables=default; --echo # ---echo # MDEV-1571: Setting user variable in recursive CTE +--echo # MDEV-15571: using recursive cte with big_tables enabled --echo # set big_tables=1; @@ -2126,3 +2126,67 @@ with recursive qn as select * from qn; set big_tables=default; + +--echo # +--echo # MDEV-15556: using recursive cte with big_tables enabled +--echo # when recursive tables are accessed by key +--echo # + +SET big_tables=1; + +CREATE TABLE t1 (id int, name char(10), leftpar int, rightpar int); +INSERT INTO t1 VALUES + (1, "A", 2, 3), (2, "LA", 4, 5), (4, "LLA", 6, 7), + (6, "LLLA", NULL, NULL), (7, "RLLA", NULL, NULL), (5, "RLA", 8, 9), + (8, "LRLA", NULL, NULL), (9, "RRLA", NULL, NULL), (3, "RA", 10, 11), + (10, "LRA", 12, 13), (11, "RRA", 14, 15), (15, "RRRA", NULL, NULL), + (16, "B", 17, 18), (17, "LB", NULL, NULL), (18, "RB", NULL, NULL); + +CREATE TABLE t2 SELECT * FROM t1 ORDER BY rand(); + +let $q= +WITH RECURSIVE tree_of_a AS + (SELECT *, cast(id AS char(200)) AS path FROM t2 WHERE name="A" + UNION ALL + SELECT t2.*, concat(tree_of_a.path,",",t2.id) + FROM t2 JOIN tree_of_a ON t2.id=tree_of_a.leftpar + UNION ALL + SELECT t2.*, concat(tree_of_a.path,",",t2.id) + FROM t2 JOIN tree_of_a ON t2.id=tree_of_a.rightpar) +SELECT * FROM tree_of_a +ORDER BY path; + +eval $q; +eval EXPLAIN $q; + +DROP TABLE t1,t2; + +SET big_tables=0; + +--echo # +--echo # MDEV-15840: recursive tables are accessed by key +--echo # (the same problem as for MDEV-15556) +--echo # + +--source include/have_sequence.inc + +CREATE TABLE t1 (p1 text,k2 int, p2 text, k1 int); +INSERT INTO t1 select seq, seq, seq, seq from seq_1_to_1000; + +DELIMITER |; +CREATE PROCEDURE getNums() +BEGIN +WITH RECURSIVE cte as +( + SELECT * FROM t1 + UNION + SELECT c.* FROM t1 c JOIN cte p ON c.p1 = p.p2 AND c.k2 = p.k1 +) +SELECT * FROM cte LIMIT 10; +END | + +DELIMITER ;| +call getNums(); + +DROP PROCEDURE getNums; +DROP TABLE t1; diff --git a/sql/sql_cte.cc b/sql/sql_cte.cc index dd46295..6bc833b 100644 --- a/sql/sql_cte.cc +++ b/sql/sql_cte.cc @@ -1401,7 +1401,7 @@ bool With_element::instantiate_tmp_tables() { if (!rec_table->is_created() && instantiate_tmp_table(rec_table, - rec_result->tmp_table_param.keyinfo, + rec_table->s->key_info, rec_result->tmp_table_param.start_recinfo, &rec_result->tmp_table_param.recinfo, 0))

1 0

[Commits] 6128507: MDEV-15571 Wrong results with big_tables=1 and CTE
by IgorBabaev 16 Apr '18

16 Apr '18

revision-id: 612850782d6d8bbe44d2b153a045b9a8afc624ef (mariadb-10.2.14-50-g6128507) parent(s): 224f7af911487f25cc2f768b66a1cce1b3833fd0 author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-16 08:55:15 -0700 message: MDEV-15571 Wrong results with big_tables=1 and CTE The cause of this bug was the same as for the bug mdev-15575. Fixed by the patch for the latter. --- mysql-test/r/cte_recursive.result | 13 +++++++++++++ mysql-test/t/cte_recursive.test | 17 +++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/r/cte_recursive.result index 55cd30f..01443bb 100644 --- a/mysql-test/r/cte_recursive.result +++ b/mysql-test/r/cte_recursive.result @@ -3080,3 +3080,16 @@ a 129 130 set big_tables=default; +# +# MDEV-1571: Setting user variable in recursive CTE +# +set big_tables=1; +with recursive qn as +( +select 1 as a from dual +union all +select a*2000 from qn where a<10000000000000000000 +) +select * from qn; +ERROR 22003: BIGINT value is out of range in '`qn`.`a` * 2000' +set big_tables=default; diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/t/cte_recursive.test index 373d6ca..008c8ea 100644 --- a/mysql-test/t/cte_recursive.test +++ b/mysql-test/t/cte_recursive.test @@ -2109,3 +2109,20 @@ with recursive qn as select * from qn; set big_tables=default; + +--echo # +--echo # MDEV-1571: Setting user variable in recursive CTE +--echo # + +set big_tables=1; + +--error ER_DATA_OUT_OF_RANGE +with recursive qn as +( + select 1 as a from dual + union all + select a*2000 from qn where a<10000000000000000000 +) +select * from qn; + +set big_tables=default;

1 0

[Commits] 46bd3c3: MDEV-15575 different results when using CTE and big_tables=1.
by IgorBabaev 16 Apr '18

16 Apr '18

revision-id: 46bd3c3c4d696e8bbadc71d5b75e1cd022da3afc (mariadb-10.2.14-35-g46bd3c3) parent(s): 740fc2ae084f8f81990de557d696aefbc507752d author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-16 07:19:19 -0700 message: MDEV-15575 different results when using CTE and big_tables=1. This bug happened due to a defect of the implementation of the handler function ha_delete_all_rows() for the ARIA engine. The function maria_delete_all_rows() truncated the table, but it didn't touch the write cache, so the cache's write offset was not reset. In the scenario like in the function st_select_lex_unit::exec_recursive when first all records were deleted from the table and then several new records were added some metadata became inconsistent with the state of the cache. As a result the table scan function could not read records at the end of the table. The same defect could be found in the implementation of ha_delete_all_rows() for the MYISAM engine mi_delete_all_rows(). Additionally made late instantiation for the temporary table used to store rows that were used for each new iteration when executing a recursive CTE. --- mysql-test/r/cte_recursive.result | 17 +++++++++++++++++ mysql-test/t/cte_recursive.test | 12 ++++++++++++ sql/sql_union.cc | 31 ++++++++++++++++++------------- storage/maria/ma_delete_all.c | 3 +++ storage/myisam/mi_delete_all.c | 4 ++++ 5 files changed, 54 insertions(+), 13 deletions(-) diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/r/cte_recursive.result index 4e9b4ae..55cd30f 100644 --- a/mysql-test/r/cte_recursive.result +++ b/mysql-test/r/cte_recursive.result @@ -3063,3 +3063,20 @@ SELECT * FROM cte; 5 2 3 +# +# MDEV-15575: using recursive cte with big_tables enabled +# +set big_tables=1; +with recursive qn as +(select 123 as a union all select 1+a from qn where a<130) +select * from qn; +a +123 +124 +125 +126 +127 +128 +129 +130 +set big_tables=default; diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/t/cte_recursive.test index c3a5ed5..373d6ca 100644 --- a/mysql-test/t/cte_recursive.test +++ b/mysql-test/t/cte_recursive.test @@ -2097,3 +2097,15 @@ WITH RECURSIVE cte AS UNION SELECT @c:=@c+1 FROM cte WHERE @c<3) SELECT * FROM cte; + +--echo # +--echo # MDEV-15575: using recursive cte with big_tables enabled +--echo # + +set big_tables=1; + +with recursive qn as +(select 123 as a union all select 1+a from qn where a<130) +select * from qn; + +set big_tables=default; diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 19c9330..3fe8a24 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -214,19 +214,13 @@ select_union_recursive::create_result_table(THD *thd_arg, if (! (incr_table= create_tmp_table(thd_arg, &tmp_table_param, *column_types, (ORDER*) 0, false, 1, options, HA_POS_ERROR, "", - !create_table, keep_row_order))) + true, keep_row_order))) return true; incr_table->keys_in_use_for_query.clear_all(); for (uint i=0; i < table->s->fields; i++) incr_table->field[i]->flags &= ~PART_KEY_FLAG; - if (create_table) - { - incr_table->file->extra(HA_EXTRA_WRITE_CACHE); - incr_table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); - } - TABLE *rec_table= 0; if (! (rec_table= create_tmp_table(thd_arg, &tmp_table_param, *column_types, (ORDER*) 0, false, 1, @@ -270,8 +264,11 @@ void select_union_recursive::cleanup() if (incr_table) { - incr_table->file->extra(HA_EXTRA_RESET_STATE); - incr_table->file->ha_delete_all_rows(); + if (incr_table->is_created()) + { + incr_table->file->extra(HA_EXTRA_RESET_STATE); + incr_table->file->ha_delete_all_rows(); + } free_tmp_table(thd, incr_table); } @@ -1228,16 +1225,24 @@ bool st_select_lex_unit::exec_recursive() if (!was_executed) save_union_explain(thd->lex->explain); - if ((saved_error= incr_table->file->ha_delete_all_rows())) - goto err; - if (with_element->level == 0) { + if (!incr_table->is_created() && + instantiate_tmp_table(incr_table, + tmp_table_param->keyinfo, + tmp_table_param->start_recinfo, + &tmp_table_param->recinfo, + 0)) + DBUG_RETURN(1); + incr_table->file->extra(HA_EXTRA_WRITE_CACHE); + incr_table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); start= first_select(); if (with_element->with_anchor) end= with_element->first_recursive; } - + else if ((saved_error= incr_table->file->ha_delete_all_rows())) + goto err; + for (st_select_lex *sl= start ; sl != end; sl= sl->next_select()) { thd->lex->current_select= sl; diff --git a/storage/maria/ma_delete_all.c b/storage/maria/ma_delete_all.c index a14603b..ee75218 100644 --- a/storage/maria/ma_delete_all.c +++ b/storage/maria/ma_delete_all.c @@ -135,6 +135,9 @@ int maria_delete_all_rows(MARIA_HA *info) goto err; } + if (info->opt_flag & WRITE_CACHE_USED) + reinit_io_cache(&info->rec_cache, WRITE_CACHE, 0, 1, 1); + _ma_writeinfo(info, WRITEINFO_UPDATE_KEYFILE); #ifdef HAVE_MMAP /* Map again */ diff --git a/storage/myisam/mi_delete_all.c b/storage/myisam/mi_delete_all.c index 37fdf2d..c772e84 100644 --- a/storage/myisam/mi_delete_all.c +++ b/storage/myisam/mi_delete_all.c @@ -62,6 +62,10 @@ int mi_delete_all_rows(MI_INFO *info) if (mysql_file_chsize(info->dfile, 0, 0, MYF(MY_WME)) || mysql_file_chsize(share->kfile, share->base.keystart, 0, MYF(MY_WME))) goto err; + + if (info->opt_flag & WRITE_CACHE_USED) + reinit_io_cache(&info->rec_cache, WRITE_CACHE, 0, 1, 1); + (void) _mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE); DBUG_RETURN(0);

1 0

[Commits] 3d1ad2a5e85: MDEV-13516: encryption.create_or_replace test fails in buildbot with InnoDB assertion failure
by jan 16 Apr '18

16 Apr '18

revision-id: 3d1ad2a5e85284b5ec4bb28f744b93b0b73e3934 (mariadb-10.1.32-62-g3d1ad2a5e85) parent(s): 3e12e39fb3dd0346578d50fe98215f1c6bce354c author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-16 15:06:41 +0300 message: MDEV-13516: encryption.create_or_replace test fails in buildbot with InnoDB assertion failure fil_crypt_rotate_pages If tablespace is marked as stopping stop also page rotation fil_crypt_flush_space If tablespace is marked as stopping do not try to read page 0 and write it back. --- storage/innobase/fil/fil0crypt.cc | 24 ++++++++++++++++-------- storage/xtradb/fil/fil0crypt.cc | 24 ++++++++++++++++-------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index cb499121c86..2d149f07433 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -2019,6 +2019,12 @@ fil_crypt_rotate_pages( continue; } + /* If space is marked as stopping, stop rotating + pages. */ + if (state->space->is_stopping()) { + break; + } + fil_crypt_rotate_page(key_state, state); } } @@ -2067,20 +2073,22 @@ fil_crypt_flush_space( crypt_data->type = CRYPT_SCHEME_UNENCRYPTED; } - /* update page 0 */ - mtr_t mtr; - mtr_start(&mtr); + if (!space->is_stopping()) { + /* update page 0 */ + mtr_t mtr; + mtr_start(&mtr); - const uint zip_size = fsp_flags_get_zip_size(state->space->flags); + const uint zip_size = fsp_flags_get_zip_size(state->space->flags); - buf_block_t* block = buf_page_get_gen(space->id, zip_size, 0, + buf_block_t* block = buf_page_get_gen(space->id, zip_size, 0, RW_X_LATCH, NULL, BUF_GET, __FILE__, __LINE__, &mtr); - byte* frame = buf_block_get_frame(block); + byte* frame = buf_block_get_frame(block); - crypt_data->write_page0(frame, &mtr); + crypt_data->write_page0(frame, &mtr); - mtr_commit(&mtr); + mtr_commit(&mtr); + } } /*********************************************************************** diff --git a/storage/xtradb/fil/fil0crypt.cc b/storage/xtradb/fil/fil0crypt.cc index cb499121c86..2d149f07433 100644 --- a/storage/xtradb/fil/fil0crypt.cc +++ b/storage/xtradb/fil/fil0crypt.cc @@ -2019,6 +2019,12 @@ fil_crypt_rotate_pages( continue; } + /* If space is marked as stopping, stop rotating + pages. */ + if (state->space->is_stopping()) { + break; + } + fil_crypt_rotate_page(key_state, state); } } @@ -2067,20 +2073,22 @@ fil_crypt_flush_space( crypt_data->type = CRYPT_SCHEME_UNENCRYPTED; } - /* update page 0 */ - mtr_t mtr; - mtr_start(&mtr); + if (!space->is_stopping()) { + /* update page 0 */ + mtr_t mtr; + mtr_start(&mtr); - const uint zip_size = fsp_flags_get_zip_size(state->space->flags); + const uint zip_size = fsp_flags_get_zip_size(state->space->flags); - buf_block_t* block = buf_page_get_gen(space->id, zip_size, 0, + buf_block_t* block = buf_page_get_gen(space->id, zip_size, 0, RW_X_LATCH, NULL, BUF_GET, __FILE__, __LINE__, &mtr); - byte* frame = buf_block_get_frame(block); + byte* frame = buf_block_get_frame(block); - crypt_data->write_page0(frame, &mtr); + crypt_data->write_page0(frame, &mtr); - mtr_commit(&mtr); + mtr_commit(&mtr); + } } /***********************************************************************

1 0

[Commits] 5e94fe1: MDEV-15754 Server crashes in fill_record_n_invoke_before_triggers upon ...
by sachin 16 Apr '18

16 Apr '18

revision-id: 5e94fe189d6325028613b2c830082e07ff303acb (mariadb-10.3.5-156-g5e94fe1) parent(s): f0e4f94c230326a2f2e608e4119530d775c37b21 author: Sachin Setiya committer: Sachin Setiya timestamp: 2018-04-16 16:27:11 +0530 message: MDEV-15754 Server crashes in fill_record_n_invoke_before_triggers upon ... insert into table with TIMESTAMP INVISIBLE Problem:- The segfault occurs because value is null but since timestamp field is VISIBLE it expects a value , and it tries to call value->save_in_field(.. Timestamp field should not be visible this is the problem. Solution:- While we clone field for record0_field we don't honor the field _visibility , this patch changes that. --- mysql-test/main/invisible_field.result | 5 +++++ mysql-test/main/invisible_field.test | 8 ++++++++ sql/sql_trigger.cc | 1 + 3 files changed, 14 insertions(+) diff --git a/mysql-test/main/invisible_field.result b/mysql-test/main/invisible_field.result index c331f3f..5cea77f 100644 --- a/mysql-test/main/invisible_field.result +++ b/mysql-test/main/invisible_field.result @@ -551,3 +551,8 @@ select * from t1 natural join t2; b c a d 2 3 1 4 drop table t1, t2; +CREATE TABLE t1 (c CHAR(3), t TIMESTAMP invisible); +INSERT INTO t1 (c,t) VALUES ('foo','2000-01-01 00:00:00'); +CREATE TRIGGER tr BEFORE INSERT ON t1 FOR EACH ROW SET @a= 1; +INSERT INTO t1 SELECT * FROM t1; +DROP TABLE t1; diff --git a/mysql-test/main/invisible_field.test b/mysql-test/main/invisible_field.test index 884abb1..cfe89d7 100644 --- a/mysql-test/main/invisible_field.test +++ b/mysql-test/main/invisible_field.test @@ -238,3 +238,11 @@ insert t2 (a,b,d) values (1,2,4), (10, 30, 40); select * from t1 join t2 using (a); select * from t1 natural join t2; drop table t1, t2; +## Triggers MDEV-15754 +CREATE TABLE t1 (c CHAR(3), t TIMESTAMP invisible); +INSERT INTO t1 (c,t) VALUES ('foo','2000-01-01 00:00:00'); + +CREATE TRIGGER tr BEFORE INSERT ON t1 FOR EACH ROW SET @a= 1; +INSERT INTO t1 SELECT * FROM t1; +# Cleanup +DROP TABLE t1; diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 4c1e2a5..d523779 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1240,6 +1240,7 @@ bool Table_triggers_list::prepare_record_accessors(TABLE *table) return 1; f->flags= (*fld)->flags; + f->invisible= (*fld)->invisible; f->null_ptr= null_ptr; f->null_bit= null_bit; if (null_bit == 128)

1 0

[Commits] 40bed2d: MyRocks: Add files lost during the merge
by psergey＠askmonty.org 16 Apr '18

16 Apr '18

revision-id: 40bed2d39e0409d3a1ff468f792ec00ae0c8e7df parent(s): ce4149fc9b5eda464919cefb6ea22d02879a6882 committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-16 11:06:43 +0300 message: MyRocks: Add files lost during the merge Include files that upstream has in mysql-test/include and so they were not picked up by the merge process --- .../rocksdb/include/restart_mysqld_with_invalid_option.inc | 8 ++++++++ .../rocksdb/include/start_mysqld_with_option.inc | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/storage/rocksdb/mysql-test/rocksdb/include/restart_mysqld_with_invalid_option.inc b/storage/rocksdb/mysql-test/rocksdb/include/restart_mysqld_with_invalid_option.inc new file mode 100644 index 0000000..8eef7ed --- /dev/null +++ b/storage/rocksdb/mysql-test/rocksdb/include/restart_mysqld_with_invalid_option.inc @@ -0,0 +1,8 @@ +--source include/shutdown_mysqld.inc + +# Expect the server to fail to come up with these options +--error 1 +--exec $MYSQLD_CMD --plugin_load=$HA_ROCKSDB_SO $_mysqld_option + +# Restart the server with the default options +--source include/start_mysqld.inc diff --git a/storage/rocksdb/mysql-test/rocksdb/include/start_mysqld_with_option.inc b/storage/rocksdb/mysql-test/rocksdb/include/start_mysqld_with_option.inc new file mode 100644 index 0000000..73e30b3 --- /dev/null +++ b/storage/rocksdb/mysql-test/rocksdb/include/start_mysqld_with_option.inc @@ -0,0 +1,14 @@ +# Include this script only after using shutdown_mysqld.inc +# where $_expect_file_name was initialized. +# Write file to make mysql-test-run.pl start up the server again +--exec echo "restart:$_mysqld_option" > $_expect_file_name + +# Turn on reconnect +--enable_reconnect + +# Call script that will poll the server waiting for it to be back online again +--source include/wait_until_connected_again.inc + +# Turn off reconnect again +--disable_reconnect +

1 0

[Commits] 608d677: Post review changes for MDEV-12387
by galina.shalygina＠mariadb.com 15 Apr '18

15 Apr '18

revision-id: 608d6773bff86b82d9fa35e77065cb0b6ed9e547 (mariadb-10.3.4-58-g608d677) parent(s): 5db956f9df61eb11410cc8331853d43f6fd774d0 author: Galina Shalygina committer: Galina Shalygina timestamp: 2018-04-16 01:24:18 +0200 message: Post review changes for MDEV-12387 Mistake resolved, comments added. --- sql/opt_subselect.cc | 133 +++++++++++++++++++++++---------------------------- 1 file changed, 61 insertions(+), 72 deletions(-) diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 69b96ec..8f6483e 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -5527,36 +5527,30 @@ Item *search_for_missing_parts_of_equalities(THD *thd, /** @brief - Attach new equalities to the WHERE-clause condition + Attach the equalities to the WHERE-clause condition - @param join join of the select where equalities should be - attached + @param join join where equalities should be attached @param eq_list the set of the equalities to add @details The method modifies the condition of the join (the condition of the - WHERE clause) by adding new equalities from the eq_list. It adds new + WHERE clause) by adding new equalities from eq_list. It adds new equalities to the remain multiple equalities of the WHERE clause condition - or if it is not possible just attaches them to the WHERE clause condition. - - First multiple equalities are disjoined from the join condition to avoid - repetitions. These multiple equalities are merged with the equalities from - the eq_list. - - Example: - - MULT_EQ(t1.a, t1.b) and (t1.a = 2) will become - MULT_EQ(2, t1.a, t1.b) - - Sometimes it is not possible and in this case the eqialities that can't - be merged are saved to be attached to the condition later. - This situation can appear after the optimize of the IN subquery - predicate it is transformed in the knowlingly false equality. - For example, (3 = 1) equality. - - Than a new condition is created. It consists of the old condition from - which multiple equalities were disjoint, new multiple equalities and - the equalities that weren't attached to the multiple equalities. + and attaches them to the WHERE clause condition. + + First all multiple equalities are disjoined from the WHERE clause condition + to avoid repetitions. + Multiple equalities for the on expression of join are merged with the + equalities from eq_list. For example, MULT_EQ(t1.a, t1.b) and (t1.a = 2) + will become MULT_EQ(2, t1.a, t1.b) + Sometimes merge is not possible and in this case the equalities that can't + be merged are saved to be attached to the condition later. This situation + can appear after the optimize of the IN subquery predicate if it is + transformed in the knowingly false equality. For example, (3 = 1) equality. + + Finally, a new condition is created. It consists of the old condition from + which multiple equalities were disjoint, new multiple equalities and the + equalities from eq_list that weren't merged with the multiple equalities. @retval TRUE if an error occurs @retval FALSE otherwise @@ -5672,16 +5666,16 @@ bool join_equalities_after_optimize_cond(JOIN *join, ((Item_cond_and *)conds)->m_cond_equal.copy(cond_equal); cond_equal.current_level= ((Item_cond_and *)conds)->m_cond_equal.current_level; - if (mult_eq_cnt == 1) - { - it.rewind(); - conds= it++; - } - else + if (and_args) { and_args->append((List<Item> *)&cond_equal.current_level); conds= search_for_missing_parts_of_equalities(thd, 0, conds, &cond_equal); } + else if (mult_eq_cnt == 1) + { + it.rewind(); + conds= it++; + } join->conds= conds; @@ -5792,21 +5786,25 @@ bool execute_degenerate_jtbm_semi_join(THD *thd, /** - @brief Find degenerate jtbm semi joins + @brief + Execute degenerate jtbm semi joins before optimize_cond() for parent @param join the parent join for jtbm semi joins - @param join_list the list of TABLE_LIST objects where jtbm semi join can occur - @param eq_list IN/OUT the list where to add produced equalities + @param join_list the list of tables where jtbm semi joins are processed + @param eq_list IN/OUT the list where to add equalities produced after + materialization of single-row degenerate jtbm semi joins @details The method traverses join_list trying to find any degenerate jtbm semi joins for subqueries of IN predicates. For each degenerate jtbm - semi join execute_degenerate_jtbm_semi_join is called. + semi join execute_degenerate_jtbm_semi_join() is called. As a result + of this call new equalities that substitute for single-row materialized + jtbm semi join are added to eq_list. - In the case when a TABLE_LIST object is nested in another TABLE_LIST - 'nested_join' method is recursively called for the list - of TABLE_LIST objects of the 'nested_join' trying to find in the list - any degenerate jtbm semi joins. + In the case when a table is nested in another table 'nested_join' the + method is recursively called for the join_list of the 'nested_join' trying + to find in the list any degenerate jtbm semi joins. Currently a jtbm semi + join may occur in a mergeable semi join nest. @retval TRUE if an error occurs @retval FALSE otherwise @@ -5854,48 +5852,39 @@ setup_degenerate_jtbm_semi_joins(JOIN *join, /** - @brief Prepare jtbm semi joins for materialization + @brief + Optimize jtbm semi joins for materialization @param join the parent join for jtbm semi joins - @param join_list the list of TABLE_LIST objects where jtbm semi join can occur + @param join_list the list of TABLE_LIST objects where jtbm semi join + can occur @param eq_list IN/OUT the list where to add produced equalities @details + This method is called by the optimizer after the call of + optimize_cond() for parent select. The method traverses join_list trying to find any jtbm semi joins for - subqueries from IN predicates. It either materializes the jtbm semi join - or creates a temporary table into which the jtbm semi join will be - materialized. The IN subquery predicate is optimized first to get the - information about how it should be handled. - - The first case is when the jtbm semi join is degenerate. Usually the - jtbm semi join is found degenerate before the optimization and on this - step it is already materialized by the setup_degenerate_jtbm_semi_joins - method. Btw there can appear a situation when the jtbm semi join becomes - degenerate only after the optimization of the IN subquery predicate. - In this case the execute_degenerate_jtbm_semi_join method is called. - - Example taken from subselect.test: - - SELECT * FROM t1 - WHERE 4 IN ( - SELECT MAX(b) - FROM t2 - WHERE EXISTS (SELECT * FROM t1)); - - Only after the optimization of EXISTS it is found that the WHERE-clause - of the IN subquery predicate is impossible. So the jtbm semi join for - the subquery from this predicate is degenerate and should be materialized. - - In the other case the IN subquery predicate should be computed via a - hash semi-join. It creates a temporary table in which the jtbm semi join - of the subquery from this predicate will be materialized. - The equalities between all pairs of expressions of the IN subquery - predicate are attached to the eq_list to be later conjuncted with the + subqueries from IN predicates and optimizes them. + After the optimization some of jtbm semi joins may become degenerate. + For example the subquery SELECT MAX(b) FROM t2 from the query + SELECT * FROM t1 WHERE 4 IN (SELECT MAX(b) FROM t2); + will become degenerate if there is an index on t2.b. + If a subquery becomes degenerate it is handled by the function + execute_degenerate_jtbm_semi_join(). + + Otherwise the method creates a temporary table in which the subquery + of the jtbm semi join will be materialied. + + The function saves the equalities between all pairs of the expressions + from the left part of the IN subquery predicate and the corresponding + columns of the subquery from the predicate in eq_list appending them + to the list. The equalities of eq_list will be later conjucted with the condition of the WHERE clause. - In the case when a TABLE_LIST object is nested in another TABLE_LIST - the method is recursively called for the list of TABLE_LIST objects - of the nested join. + In the case when a table is nested in another table 'nested_join' the + method is recursively called for the join_list of the 'nested_join' trying + to find in the list any degenerate jtbm semi joins. Currently a jtbm semi + join may occur in a mergeable semi join nest. @retval TRUE if an error occurs @retval FALSE otherwise

1 0