- commits - lists.mariadb.org

[Commits] 5de8fea: Fix after the latest rebase of commits for MDEV-28883
by IgorBabaev 13 Sep '22

13 Sep '22

revision-id: 5de8fea53b9a4d18c146f96c0b6f13e96a322260 (mariadb-10.10.1-14-g5de8fea) parent(s): ea772f29e422ac4f76dbc031480f05a050433add author: Igor Babaev committer: Igor Babaev timestamp: 2022-09-13 16:14:10 -0700 message: Fix after the latest rebase of commits for MDEV-28883 --- sql/sql_delete.cc | 3 +++ sql/sql_update.cc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 8acc502..5191bae 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -44,6 +44,9 @@ // end_read_record #include "sql_insert.h" // fix_rownum_pointers #include "sql_partition.h" // make_used_partitions_str +#ifdef WITH_WSREP +#include "wsrep_mysqld.h" +#endif #define MEM_STRIP_BUF_SIZE ((size_t) thd->variables.sortbuff_size) diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 94454c2..439ff63 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -45,6 +45,9 @@ #include "sql_insert.h" // For vers_insert_history_row() that may be // needed for System Versioning. +#ifdef WITH_WSREP +#include "wsrep_mysqld.h" +#endif /** True if the table's input and output record buffers are comparable using

1 0

[Commits] 3d763f5: MDEV-29310 Re-design the upper level of handling INSERT and INSERT_SELECT statements
by IgorBabaev 13 Sep '22

13 Sep '22

revision-id: 3d763f5d31da5670ee68cfbc96bf9aa7e84500e9 (mariadb-10.10.1-8-g3d763f5) parent(s): a535590ada1c437608c8a041aa6543f6f62c3ff2 author: Igor Babaev committer: Igor Babaev timestamp: 2022-09-13 09:41:54 -0700 message: MDEV-29310 Re-design the upper level of handling INSERT and INSERT_SELECT statements Saved intermediate code. --- sql/sql_insert.cc | 62 ++++++++++++++++++++++++++++++ sql/sql_insert.h | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ sql/sql_lex.cc | 23 +++++++++++ sql/sql_parse.cc | 6 +++ sql/sql_yacc.yy | 4 ++ 5 files changed, 208 insertions(+) diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index baa7f78..63687d7 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -5333,3 +5333,65 @@ void select_create::abort_result_set() DBUG_VOID_RETURN; } + + +bool Sql_cmd_insert_base::precheck(THD *thd) +{ + /* + Since INSERT DELAYED doesn't support temporary tables, we could + not pre-open temporary tables for SQLCOM_INSERT / SQLCOM_REPLACE. + Open them here instead. + */ + if (first_table->lock_type != TL_WRITE_DELAYED && + thd->open_temporary_tables(lex->query_tables)) + return true; + + if (insert_precheck(thd, lex->query_tables)) + return true; + + WSREP_SYNC_WAIT(thd, WSREP_SYNC_WAIT_BEFORE_INSERT_REPLACE); + + return false; + +#ifdef WITH_WSREP +wsrep_error_label: +#endif + return true; +} + + +bool Sql_cmd_insert_base::prepare_inner(THD *thd) +{ + SELECT_LEX *const select_lex= thd->lex->first_select_lex(); + TABLE_LIST *const table_list= select_lex->get_table_list(); + const bool select_insert= insert_many_values.elements == 0; + TABLE *table; + + DBUG_ENTER("Sql_cmd_delete::prepare_inner"); + + (void) read_statistics_for_tables_if_needed(thd, table_list); + + { + if (mysql_handle_derived(lex, DT_INIT)) + DBUG_RETURN(TRUE); + if (mysql_handle_derived(lex, DT_MERGE_FOR_INSERT)) + DBUG_RETURN(TRUE); + if (mysql_handle_derived(lex, DT_PREPARE)) + DBUG_RETURN(TRUE); + } + + if (duplicates == DUP_UPDATE) + { + /* it should be allocated before Item::fix_fields() */ + if (table_list->set_insert_values(thd->mem_root)) + DBUG_RETURN(TRUE); + } + + table= table_list->table; + + if (table->file->check_if_updates_are_ignored("INSERT")) + DBUG_RETURN(-1); + + +} + diff --git a/sql/sql_insert.h b/sql/sql_insert.h index 8b034c2..20ead97a 100644 --- a/sql/sql_insert.h +++ b/sql/sql_insert.h @@ -51,4 +51,117 @@ bool binlog_drop_table(THD *thd, TABLE *table); inline void kill_delayed_threads(void) {} #endif + +/** + Base class for all INSERT and REPLACE statements. Abstract class that + is inherited by Sql_cmd_insert_values and Sql_cmd_insert_select. +*/ + +class Sql_cmd_insert_base : public Sql_cmd_dml +{ + protected: + virtual bool precheck(THD *thd) override; + + virtual bool prepare_inner(THD *thd) override; + + private: + bool resolve_update_expressions(THD *thd); + bool prepare_values_table(THD *thd); + bool resolve_values_table_columns(THD *thd); + + /** + Field list to insert/replace + + One of two things: + 1. For the INSERT/REPLACE ... (col1, ... colN) VALUES ... syntax + this is a list of col1, ..., colN fields. + 2. For the INSERT/REPLACE ... SET col1=x1, ... colM=xM syntax extension + this is a list of col1, ... colM fields as well. + */ + List<Item> insert_field_list; + + protected: + const bool is_replace; + + /** + Row data to insert/replace + + One of two things: + 1. For the INSERT/REPLACE ... VALUES (row1), (row2), ... (rowN) syntax + the list contains N List_item lists: one List_item per row. + 2. For the INSERT/REPLACE ... SET col1=x1, ... colM=xM syntax extension + this list contains only 1 List_item of M data values: this way we + emulate this syntax: + INSERT/REPLACE ... (col1, ... colM) VALUE (x1, ..., xM); + */ + List<List_item> insert_many_values; + + /* + Number of values per row in insert_many_values, available after resolving + */ + uint value_count; + + /* ON DUPLICATE KEY UPDATE field list */ + List<Item> update_field_list; + + const enum_duplicates duplicates; + + explicit Sql_cmd_insert_base(bool is_replace_arg, + enum_duplicates duplicates_arg) + : empty_field_list_on_rset(false), + is_replace(is_replace_arg), + value_count(0), + duplicates(duplicates_arg) {} + + virtual void cleanup(THD *) override + { + if (empty_field_list_on_rset) { + empty_field_list_on_rset = false; + insert_field_list.empty(); + } + } + +}; + + +/** + Class that implements INSERT ... VALUES and REPLACE ... VALUES statements. +*/ + +class Sql_cmd_insert_values final : public Sql_cmd_insert_base +{ +public: + explicit Sql_cmd_insert_values(bool is_replace_arg, + enum_duplicates duplicates_arg) + : Sql_cmd_insert_base(is_replace_arg, duplicates_arg) {} + + enum_sql_command sql_command_code() const + { + return is_replace ? SQLCOM_REPLACE : SQLCOM_INSERT; + } + +protected: + bool execute_inner(THD *thd); +}; + + +/** + Class that implements INSERT ... SELECT and REPLACE ... SELECT statements. +*/ + +class Sql_cmd_insert_select final : public Sql_cmd_insert_base +{ +public: + explicit Sql_cmd_insert_select(bool is_replace_arg, + enum_duplicates duplicates_arg) + : Sql_cmd_insert_base(is_replace_arg, duplicates_arg) {} + + enum_sql_command sql_command_code() const + { + return is_replace ? SQLCOM_REPLACE_SELECT : SQLCOM_INSERT_SELECT; + } +}; + + + #endif /* SQL_INSERT_INCLUDED */ diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 8f9d042..3fb8231 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -10361,13 +10361,19 @@ SELECT_LEX *LEX::parsed_subselect(SELECT_LEX_UNIT *unit) bool LEX::parsed_insert_select(SELECT_LEX *first_select) { + bool is_insert_or_replace= false; + bool is_replace= false; if (sql_command == SQLCOM_INSERT || sql_command == SQLCOM_REPLACE) { + is_insert_or_replace= true; if (sql_command == SQLCOM_INSERT) sql_command= SQLCOM_INSERT_SELECT; else + { + is_replace= true; sql_command= SQLCOM_REPLACE_SELECT; + } } insert_select_hack(first_select); if (check_main_unit_semantics()) @@ -10377,6 +10383,23 @@ bool LEX::parsed_insert_select(SELECT_LEX *first_select) SELECT_LEX *blt __attribute__((unused))= pop_select(); DBUG_ASSERT(blt == &builtin_select); push_select(first_select); + + if (is_insert_or_replace) + { + if (sql_command == SQLCOM_INSERT || sql_command == SQLCOM_REPLACE) + { + if (!(m_sql_cmd= new (thd->mem_root) Sql_cmd_insert_values(is_replace, + duplicates))) + return true; + } + else + { + if (!(m_sql_cmd= new (thd->mem_root) Sql_cmd_insert_select(is_replace, + duplicates))) + return true; + } + } + return false; } diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index e638d72..9258012 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4376,6 +4376,10 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt) res = mysql_checksum_table(thd, first_table, &lex->check_opt); break; } + case SQLCOM_REPLACE: + case SQLCOM_INSERT: + case SQLCOM_REPLACE_SELECT: + case SQLCOM_INSERT_SELECT: case SQLCOM_UPDATE: case SQLCOM_UPDATE_MULTI: case SQLCOM_DELETE: @@ -4388,6 +4392,7 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt) thd->abort_on_warning= 0; break; } +#if 0 case SQLCOM_REPLACE: if ((res= generate_incident_event(thd))) break; @@ -4647,6 +4652,7 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt) break; } +#endif case SQLCOM_DROP_SEQUENCE: case SQLCOM_DROP_TABLE: { diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 13f0dbd..a137887 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -12968,6 +12968,10 @@ replace: } insert_start replace_lock_option opt_into insert_table { + if (!(Lex->m_sql_cmd= + new (thd->mem_root) Sql_cmd_insert_values(true, + Lex->duplicates))) + MYSQL_YYABORT; Select->set_lock_for_tables($4, true, false); } insert_field_spec opt_returning

1 0

[Commits] f78fcd3: MDEV-29350 Crash when IN predicand is used in eliminated GROUP BY clause
by IgorBabaev 24 Aug '22

24 Aug '22

revision-id: f78fcd317a2496ac65c8995fb5c65c248e85c2d8 (mariadb-10.3.35-113-gf78fcd3) parent(s): c2300d06f7845f51db6318c2fdcbadd6becc0e89 author: Igor Babaev committer: Igor Babaev timestamp: 2022-08-24 11:07:09 -0700 message: MDEV-29350 Crash when IN predicand is used in eliminated GROUP BY clause This bug affected some queries with an IN/ALL/ANY predicand or an EXISTS predicate whose subquery contained a GROUP BY clause that could be eliminated. If this clause used a IN/ALL/ANY predicand whose left operand was a single-value subquery then execution of the query caused a crash of the server after invokation of remove_redundant_subquery_clauses(). The crash was caused by an attempt to exclude the unit for the single-value subquery from the query tree for the second time by the function Item_subselect::eliminate_subselect_processor(). This bug had been masked by the bug MDEV-28617 until a fix for the latter that properly excluded units was pushed into 10.3. Approved by Oleksandr Byelkin <sanja(a)mariadb.com> --- mysql-test/main/subselect4.result | 116 ++++++++++++++++++++++++++++++++++++++ mysql-test/main/subselect4.test | 74 ++++++++++++++++++++++++ sql/item_subselect.cc | 3 +- 3 files changed, 192 insertions(+), 1 deletion(-) diff --git a/mysql-test/main/subselect4.result b/mysql-test/main/subselect4.result index c374040..c794aad 100644 --- a/mysql-test/main/subselect4.result +++ b/mysql-test/main/subselect4.result @@ -3038,4 +3038,120 @@ a 3 2 drop table t1,t2,t3; +# +# MDEV-29139: Redundant IN/ALL/ANY predicand in GROUP BY clause of +# IN/ALL/ANY/EXISTS subquery +# +create table t1 (a int); +create table t2 (b int); +create table t3 (c int); +create table t4 (d int); +insert into t1 values (3), (1); +insert into t2 values (3), (2); +insert into t3 values (4), (2); +insert into t4 values (1), (7); +explain extended select b from t2 +where exists (select c from t3 +group by (select a from t1 where a = 1) in (select d from t4)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t2 ALL NULL NULL NULL NULL 2 100.00 +2 SUBQUERY t3 ALL NULL NULL NULL NULL 2 100.00 +Warnings: +Note 1003 /* select#1 */ select `test`.`t2`.`b` AS `b` from `test`.`t2` where 1 +select b from t2 +where exists (select c from t3 +group by (select a from t1 where a = 1) in (select d from t4)); +b +3 +2 +prepare stmt from "select b from t2 +where exists (select c from t3 +group by (select a from t1 where a = 1) in (select d from t4))"; +execute stmt; +b +3 +2 +execute stmt; +b +3 +2 +deallocate prepare stmt; +explain extended select b from t2 +where exists (select c from t3 +group by (select a from t1 where a = 1) >= +any (select d from t4)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t2 ALL NULL NULL NULL NULL 2 100.00 +2 SUBQUERY t3 ALL NULL NULL NULL NULL 2 100.00 +Warnings: +Note 1003 /* select#1 */ select `test`.`t2`.`b` AS `b` from `test`.`t2` where 1 +select b from t2 +where exists (select c from t3 +group by (select a from t1 where a = 1) >= +any (select d from t4)); +b +3 +2 +explain extended select b from t2 +where exists (select c from t3 +group by (select a from t1 where a = 1) < +all (select d from t4)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t2 ALL NULL NULL NULL NULL 2 100.00 +2 SUBQUERY t3 ALL NULL NULL NULL NULL 2 100.00 +Warnings: +Note 1003 /* select#1 */ select `test`.`t2`.`b` AS `b` from `test`.`t2` where 1 +select b from t2 +where exists (select c from t3 +group by (select a from t1 where a = 1) < +all (select d from t4)); +b +3 +2 +explain extended select b from t2 +where b in (select c from t3 +group by (select a from t1 where a = 1) in (select d from t4)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t2 ALL NULL NULL NULL NULL 2 100.00 +1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1 100.00 +2 MATERIALIZED t3 ALL NULL NULL NULL NULL 2 100.00 +Warnings: +Note 1003 select `test`.`t2`.`b` AS `b` from `test`.`t2` semi join (`test`.`t3`) where 1 +select b from t2 +where b in (select c from t3 +group by (select a from t1 where a = 1) in (select d from t4)); +b +2 +explain extended select b from t2 +where b >= any (select c from t3 +group by (select a from t1 where a = 1) in +(select d from t4)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t2 ALL NULL NULL NULL NULL 2 100.00 Using where +2 SUBQUERY t3 ALL NULL NULL NULL NULL 2 100.00 +Warnings: +Note 1003 /* select#1 */ select `test`.`t2`.`b` AS `b` from `test`.`t2` where <nop>(<in_optimizer>(`test`.`t2`.`b`,(/* select#2 */ select min(`test`.`t3`.`c`) from `test`.`t3`) <= <cache>(`test`.`t2`.`b`))) +select b from t2 +where b >= any (select c from t3 +group by (select a from t1 where a = 1) in +(select d from t4)); +b +3 +2 +explain extended select b from t2 +where b <= all (select c from t3 +group by (select a from t1 where a = 1) in +(select d from t4)); +id select_type table type possible_keys key key_len ref rows filtered Extra +1 PRIMARY t2 ALL NULL NULL NULL NULL 2 100.00 Using where +2 SUBQUERY t3 ALL NULL NULL NULL NULL 2 100.00 +Warnings: +Note 1003 /* select#1 */ select `test`.`t2`.`b` AS `b` from `test`.`t2` where <not>(<in_optimizer>(`test`.`t2`.`b`,<min>(/* select#2 */ select `test`.`t3`.`c` from `test`.`t3`) < <cache>(`test`.`t2`.`b`))) +select b from t2 +where b <= all (select c from t3 +group by (select a from t1 where a = 1) in +(select d from t4)); +b +2 +drop table t1,t2,t3,t4; # End of 10.3 tests diff --git a/mysql-test/main/subselect4.test b/mysql-test/main/subselect4.test index 2faede5..6aedabc 100644 --- a/mysql-test/main/subselect4.test +++ b/mysql-test/main/subselect4.test @@ -2477,4 +2477,78 @@ eval $q3; drop table t1,t2,t3; +--echo # +--echo # MDEV-29139: Redundant IN/ALL/ANY predicand in GROUP BY clause of +--echo # IN/ALL/ANY/EXISTS subquery +--echo # + +create table t1 (a int); +create table t2 (b int); +create table t3 (c int); +create table t4 (d int); + +insert into t1 values (3), (1); +insert into t2 values (3), (2); +insert into t3 values (4), (2); +insert into t4 values (1), (7); + +let $q1= +select b from t2 + where exists (select c from t3 + group by (select a from t1 where a = 1) in (select d from t4)); + +eval explain extended $q1; +eval $q1; + +eval prepare stmt from "$q1"; +execute stmt; +execute stmt; +deallocate prepare stmt; + +let $q2= +select b from t2 + where exists (select c from t3 + group by (select a from t1 where a = 1) >= + any (select d from t4)); + +eval explain extended $q2; +eval $q2; + +let $q3= +select b from t2 + where exists (select c from t3 + group by (select a from t1 where a = 1) < + all (select d from t4)); + +eval explain extended $q3; +eval $q3; + +let $q4= +select b from t2 + where b in (select c from t3 + group by (select a from t1 where a = 1) in (select d from t4)); + +eval explain extended $q4; +eval $q4; + +let $q5= +select b from t2 + where b >= any (select c from t3 + group by (select a from t1 where a = 1) in + (select d from t4)); + +eval explain extended $q5; +eval $q5; + +let $q6= +select b from t2 + where b <= all (select c from t3 + group by (select a from t1 where a = 1) in + (select d from t4)); + +eval explain extended $q6; +eval $q6; + +drop table t1,t2,t3,t4; + --echo # End of 10.3 tests diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 2e33a71..ee36ee2 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -379,7 +379,8 @@ bool Item_subselect::mark_as_eliminated_processor(void *arg) bool Item_subselect::eliminate_subselect_processor(void *arg) { unit->item= NULL; - unit->exclude(); + if (!unit->is_excluded()) + unit->exclude(); eliminated= TRUE; return FALSE; }

1 0

[Commits] a535590: Applied the changes introduced in the commit
by IgorBabaev 19 Aug '22

19 Aug '22

revision-id: a535590ada1c437608c8a041aa6543f6f62c3ff2 (mariadb-10.10.1-7-ga535590) parent(s): f2611c41467b89bccd2d783da7b4b8bc4abea552 author: Igor Babaev committer: Igor Babaev timestamp: 2022-08-18 20:40:04 -0700 message: Applied the changes introduced in the commit 92a328099800486fe585a54d31ddf84c02ec6ae0 Author: Oleksandr Byelkin <sanja(a)mariadb.com> Tue Jul 12 00:25:08 2022 Committer: Oleksandr Byelkin <sanja(a)mariadb.com> Thu Jul 14 00:46:06 2022 for the code of MDEV-28883. --- sql/sql_delete.cc | 2 +- sql/sql_lex.cc | 2 +- sql/sql_lex.h | 9 --------- sql/sql_yacc.yy | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 646f043..8acc502 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -1537,7 +1537,7 @@ bool Sql_cmd_delete::prepare_inner(THD *thd) } if (!(result= new (thd->mem_root) multi_delete(thd, aux_tables, - lex->table_count))) + lex->table_count_update))) { DBUG_RETURN(TRUE); } diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index bc11a51..8f9d042 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1304,7 +1304,7 @@ void LEX::start(THD *thd_arg) wild= 0; exchange= 0; - table_count= 0; + table_count_update= 0; DBUG_VOID_RETURN; } diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 44b33bb..4e16247 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1774,15 +1774,6 @@ class Query_tables_list return (lock_tables_state == LTS_LOCKED); } - /** - Number of tables which were open by open_tables() and to be locked - by lock_tables(). - Note that we set this member only in some cases, when this value - needs to be passed from open_tables() to lock_tables() which are - separated by some amount of code. - */ - uint table_count; - /* These constructor and destructor serve for creation/destruction of Query_tables_list instances which are used as backup storage. diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 20b4086..13f0dbd 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -13385,7 +13385,7 @@ delete_single_table: MYSQL_YYABORT; Select->table_list.save_and_clear(&Lex->auxiliary_table_list); /* Save the number of auxiliary tables */ - Lex->table_count= 1; + Lex->table_count_update= 1; Lex->query_tables= 0; Lex->query_tables_last= &Lex->query_tables;

1 0

[Commits] f748eab: Not to be pushed.
by IgorBabaev 18 Aug '22

18 Aug '22

revision-id: f748eab1db45c2e4ffeb4e8dfa6c6462c030930c (mariadb-10.10.1-7-gf748eab) parent(s): 0cfe6acccf1d41f58d78dedbcbcc213baa5b657d author: Igor Babaev committer: Igor Babaev timestamp: 2022-08-17 18:34:52 -0700 message: Not to be pushed. --- sql/sql_delete.cc | 2 +- sql/sql_lex.cc | 2 +- sql/sql_update.cc | 173 ------------------------------------------------------ sql/sql_yacc.yy | 2 +- 4 files changed, 3 insertions(+), 176 deletions(-) diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 646f043..8acc502 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -1537,7 +1537,7 @@ bool Sql_cmd_delete::prepare_inner(THD *thd) } if (!(result= new (thd->mem_root) multi_delete(thd, aux_tables, - lex->table_count))) + lex->table_count_update))) { DBUG_RETURN(TRUE); } diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index bc11a51..8f9d042 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1304,7 +1304,7 @@ void LEX::start(THD *thd_arg) wild= 0; exchange= 0; - table_count= 0; + table_count_update= 0; DBUG_VOID_RETURN; } diff --git a/sql/sql_update.cc b/sql/sql_update.cc index b1dab6c..69fa92f 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -410,31 +410,8 @@ bool Sql_cmd_update::update_single_table(THD *thd) if (table->default_field) table->mark_default_fields_for_write(false); -<<<<<<< 87e8463e0454a04c2bbaa38d44227c491fb07dc1 -#ifndef NO_EMBEDDED_ACCESS_CHECKS - /* Check values */ - table_list->grant.want_privilege= table->grant.want_privilege= - (SELECT_ACL & ~table->grant.privilege); -#endif - if (setup_fields(thd, Ref_ptr_array(), values, MARK_COLUMNS_READ, 0, NULL, 0)) - { - free_underlaid_joins(thd, select_lex); - DBUG_RETURN(1); /* purecov: inspected */ - } - - if (table_list->table->check_assignability_explicit_fields(fields, values, - ignore)) - DBUG_RETURN(true); - - if (check_unique_table(thd, table_list)) - DBUG_RETURN(TRUE); - - switch_to_nullable_trigger_fields(fields, table); - switch_to_nullable_trigger_fields(values, table); -======= switch_to_nullable_trigger_fields(*fields, table); switch_to_nullable_trigger_fields(*values, table); ->>>>>>> MDEV-28883 Re-design the upper level of handling UPDATE and DELETE statements /* Apply the IN=>EXISTS transformation to all subqueries and optimize them */ if (select_lex->optimize_unflattened_subqueries(false)) @@ -1682,156 +1659,6 @@ bool Multiupdate_prelocking_strategy::handle_end(THD *thd) DBUG_RETURN(0); } -<<<<<<< 87e8463e0454a04c2bbaa38d44227c491fb07dc1 -/* - make update specific preparation and checks after opening tables - - SYNOPSIS - mysql_multi_update_prepare() - thd thread handler - - RETURN - FALSE OK - TRUE Error -*/ - -int mysql_multi_update_prepare(THD *thd) -{ - LEX *lex= thd->lex; - TABLE_LIST *table_list= lex->query_tables; - TABLE_LIST *tl; - Multiupdate_prelocking_strategy prelocking_strategy; - uint table_count= lex->table_count_update; - DBUG_ENTER("mysql_multi_update_prepare"); - - /* - Open tables and create derived ones, but do not lock and fill them yet. - - During prepare phase acquire only S metadata locks instead of SW locks to - keep prepare of multi-UPDATE compatible with concurrent LOCK TABLES WRITE - and global read lock. - - Don't evaluate any subqueries even if constant, because - tables aren't locked yet. - */ - lex->context_analysis_only|= CONTEXT_ANALYSIS_ONLY_DERIVED; - if (thd->lex->sql_command == SQLCOM_UPDATE_MULTI) - { - if (open_tables(thd, &table_list, &table_count, - thd->stmt_arena->is_stmt_prepare() ? MYSQL_OPEN_FORCE_SHARED_MDL : 0, - &prelocking_strategy)) - DBUG_RETURN(TRUE); - } - else - { - /* following need for prepared statements, to run next time multi-update */ - thd->lex->sql_command= SQLCOM_UPDATE_MULTI; - prelocking_strategy.reset(thd); - if (prelocking_strategy.handle_end(thd)) - DBUG_RETURN(TRUE); - } - - /* now lock and fill tables */ - if (!thd->stmt_arena->is_stmt_prepare() && - lock_tables(thd, table_list, table_count, 0)) - DBUG_RETURN(TRUE); - - lex->context_analysis_only&= ~CONTEXT_ANALYSIS_ONLY_DERIVED; - - (void) read_statistics_for_tables_if_needed(thd, table_list); - /* @todo: downgrade the metadata locks here. */ - - /* - Check that we are not using table that we are updating, but we should - skip all tables of UPDATE SELECT itself - */ - lex->first_select_lex()->exclude_from_table_unique_test= TRUE; - /* We only need SELECT privilege for columns in the values list */ - List_iterator<TABLE_LIST> ti(lex->first_select_lex()->leaf_tables); - while ((tl= ti++)) - { - if (tl->is_jtbm()) - continue; - TABLE *table= tl->table; - TABLE_LIST *tlist; - if (!(tlist= tl->top_table())->derived) - { - tlist->grant.want_privilege= - (SELECT_ACL & ~tlist->grant.privilege); - table->grant.want_privilege= (SELECT_ACL & ~table->grant.privilege); - } - DBUG_PRINT("info", ("table: %s want_privilege: %llx", tl->alias.str, - (longlong) table->grant.want_privilege)); - } - /* - Set exclude_from_table_unique_test value back to FALSE. It is needed for - further check in multi_update::prepare whether to use record cache. - */ - lex->first_select_lex()->exclude_from_table_unique_test= FALSE; - - if (lex->save_prep_leaf_tables()) - DBUG_RETURN(TRUE); - - DBUG_RETURN (FALSE); -} - - -/* - Setup multi-update handling and call SELECT to do the join -*/ - -bool mysql_multi_update(THD *thd, TABLE_LIST *table_list, List<Item> *fields, - List<Item> *values, COND *conds, ulonglong options, - enum enum_duplicates handle_duplicates, - bool ignore, SELECT_LEX_UNIT *unit, - SELECT_LEX *select_lex, multi_update **result) -{ - bool res; - DBUG_ENTER("mysql_multi_update"); - - if (!(*result= new (thd->mem_root) multi_update(thd, table_list, - &thd->lex->first_select_lex()->leaf_tables, - fields, values, handle_duplicates, ignore))) - { - DBUG_RETURN(TRUE); - } - - if ((*result)->init(thd)) - DBUG_RETURN(1); - - thd->abort_on_warning= !ignore && thd->is_strict_mode(); - List<Item> total_list; - - if (setup_tables(thd, &select_lex->context, &select_lex->top_join_list, - table_list, select_lex->leaf_tables, FALSE, FALSE)) - DBUG_RETURN(1); - - if (select_lex->vers_setup_conds(thd, table_list)) - DBUG_RETURN(1); - - res= mysql_select(thd, - table_list, total_list, conds, - select_lex->order_list.elements, - select_lex->order_list.first, NULL, NULL, NULL, - options | SELECT_NO_JOIN_CACHE | SELECT_NO_UNLOCK | - OPTION_SETUP_TABLES_DONE, - *result, unit, select_lex); - - DBUG_PRINT("info",("res: %d report_error: %d", res, (int) thd->is_error())); - res|= thd->is_error(); - if (unlikely(res)) - (*result)->abort_result_set(); - else - { - if (thd->lex->describe || thd->lex->analyze_stmt) - res= thd->lex->explain->send_explain(thd); - } - thd->abort_on_warning= 0; - DBUG_RETURN(res); -} - -======= ->>>>>>> MDEV-28883 Re-design the upper level of handling UPDATE and DELETE statements multi_update::multi_update(THD *thd_arg, TABLE_LIST *table_list, List<TABLE_LIST> *leaves_list, diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 20b4086..13f0dbd 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -13385,7 +13385,7 @@ delete_single_table: MYSQL_YYABORT; Select->table_list.save_and_clear(&Lex->auxiliary_table_list); /* Save the number of auxiliary tables */ - Lex->table_count= 1; + Lex->table_count_update= 1; Lex->query_tables= 0; Lex->query_tables_last= &Lex->query_tables;

1 0

[Commits] ed09f18: Applied the changes introduced in the commit
by IgorBabaev 17 Aug '22

17 Aug '22

revision-id: ed09f18ecab2992443aca7d8c771186913d62492 (mariadb-10.10.1-7-ged09f18) parent(s): 52618028b0ea9292b70ba0f63171320b5065dadc author: Igor Babaev committer: Igor Babaev timestamp: 2022-08-17 16:57:40 -0700 message: Applied the changes introduced in the commit 92a328099800486fe585a54d31ddf84c02ec6ae0 Author: Oleksandr Byelkin <sanja(a)mariadb.com> Tue Jul 12 00:25:08 2022 Committer: Oleksandr Byelkin <sanja(a)mariadb.com> Thu Jul 14 00:46:06 2022 for the code of MDEV-28883. --- sql/sql_delete.cc | 2 +- sql/sql_lex.cc | 2 +- sql/sql_lex.h | 9 --------- sql/sql_yacc.yy | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 646f043..8acc502 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -1537,7 +1537,7 @@ bool Sql_cmd_delete::prepare_inner(THD *thd) } if (!(result= new (thd->mem_root) multi_delete(thd, aux_tables, - lex->table_count))) + lex->table_count_update))) { DBUG_RETURN(TRUE); } diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index bc11a51..8f9d042 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1304,7 +1304,7 @@ void LEX::start(THD *thd_arg) wild= 0; exchange= 0; - table_count= 0; + table_count_update= 0; DBUG_VOID_RETURN; } diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 44b33bb..4e16247 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1774,15 +1774,6 @@ class Query_tables_list return (lock_tables_state == LTS_LOCKED); } - /** - Number of tables which were open by open_tables() and to be locked - by lock_tables(). - Note that we set this member only in some cases, when this value - needs to be passed from open_tables() to lock_tables() which are - separated by some amount of code. - */ - uint table_count; - /* These constructor and destructor serve for creation/destruction of Query_tables_list instances which are used as backup storage. diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 20b4086..13f0dbd 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -13385,7 +13385,7 @@ delete_single_table: MYSQL_YYABORT; Select->table_list.save_and_clear(&Lex->auxiliary_table_list); /* Save the number of auxiliary tables */ - Lex->table_count= 1; + Lex->table_count_update= 1; Lex->query_tables= 0; Lex->query_tables_last= &Lex->query_tables;

1 0

[Commits] b69cd6d: Correction after rebase of bb-10.10-MDEV-28883 against the latest 10.10.
by IgorBabaev 17 Aug '22

17 Aug '22

revision-id: b69cd6d4baadb7441e8afa35ac4857f619d5bb43 (mariadb-10.10.1-8-gb69cd6d) parent(s): 62b7ebb3f48596c89030064217cbafc6449554a3 author: Igor Babaev committer: Igor Babaev timestamp: 2022-08-16 21:43:40 -0700 message: Correction after rebase of bb-10.10-MDEV-28883 against the latest 10.10. --- 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 20b4086..13f0dbd 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -13385,7 +13385,7 @@ delete_single_table: MYSQL_YYABORT; Select->table_list.save_and_clear(&Lex->auxiliary_table_list); /* Save the number of auxiliary tables */ - Lex->table_count= 1; + Lex->table_count_update= 1; Lex->query_tables= 0; Lex->query_tables_last= &Lex->query_tables;

1 0

[Commits] 87e8463: Fixed some compiler issues appeared after d7ffb7c3dd95c4c5e36f75b09662faafa0fb1ecd
by IgorBabaev 16 Aug '22

16 Aug '22

revision-id: 87e8463e0454a04c2bbaa38d44227c491fb07dc1 (mariadb-10.10.1-2-g87e8463) parent(s): 63e3fc0bb76ce8b4b018d1ca1e4be6b7cd55fad1 author: Igor Babaev committer: Igor Babaev timestamp: 2022-08-16 09:26:27 -0700 message: Fixed some compiler issues appeared after d7ffb7c3dd95c4c5e36f75b09662faafa0fb1ecd Disabled atomic.rename_trigger. --- mysql-test/suite/atomic/disabled.def | 12 ++++++++++++ strings/ctype-uca.c | 2 +- strings/uca-dump.c | 6 ++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/atomic/disabled.def b/mysql-test/suite/atomic/disabled.def new file mode 100644 index 0000000..3e1f2d6 --- /dev/null +++ b/mysql-test/suite/atomic/disabled.def @@ -0,0 +1,12 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment> +# +# Do not use any TAB characters for whitespace. +# +############################################################################## +rename_trigger : MDEV-29282 2022:-08-16 Igor Babaev diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 5b3f76f..028d2cc 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -31309,7 +31309,7 @@ my_uca1400_collation_definitions[MY_UCA1400_COLLATION_DEFINITION_COUNT]= static MY_UCA_INFO my_uca1400_info_tailored[MY_CS_ENCODING_LAST+1] - [MY_UCA1400_COLLATION_DEFINITION_COUNT]= {0}; + [MY_UCA1400_COLLATION_DEFINITION_COUNT]; /* diff --git a/strings/uca-dump.c b/strings/uca-dump.c index 3c94cb8..989fe98 100644 --- a/strings/uca-dump.c +++ b/strings/uca-dump.c @@ -762,7 +762,7 @@ int main(int ac, char **av) { char *comment; char *weight; - MY_DUCET_CHARS chr = {0}; + MY_DUCET_CHARS chr = {{0,0,0,0,0,0}, 0}; if (str[0] == '#') continue; @@ -803,7 +803,9 @@ int main(int ac, char **av) } else { - MY_DUCET_WEIGHT weights= {0}; + MY_DUCET_WEIGHT weights= {{{0,0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0,0}, + {0,0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0,0}}, + 0}; my_bool dummy; if (chr.length >= MY_UCA_MAX_CONTRACTION) {

1 0

[Commits] 66fabd3: Fixed some compiler issues appeared after d7ffb7c3dd95c4c5e36f75b09662faafa0fb1ecd
by IgorBabaev 15 Aug '22

15 Aug '22

revision-id: 66fabd3e88d794477a43ffdb75faeac282daa3ed (mariadb-10.10.1-2-g66fabd3) parent(s): 63e3fc0bb76ce8b4b018d1ca1e4be6b7cd55fad1 author: Igor Babaev committer: Igor Babaev timestamp: 2022-08-15 15:58:20 -0700 message: Fixed some compiler issues appeared after d7ffb7c3dd95c4c5e36f75b09662faafa0fb1ecd --- strings/ctype-uca.c | 2 +- strings/uca-dump.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index 5b3f76f..028d2cc 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -31309,7 +31309,7 @@ my_uca1400_collation_definitions[MY_UCA1400_COLLATION_DEFINITION_COUNT]= static MY_UCA_INFO my_uca1400_info_tailored[MY_CS_ENCODING_LAST+1] - [MY_UCA1400_COLLATION_DEFINITION_COUNT]= {0}; + [MY_UCA1400_COLLATION_DEFINITION_COUNT]; /* diff --git a/strings/uca-dump.c b/strings/uca-dump.c index 3c94cb8..989fe98 100644 --- a/strings/uca-dump.c +++ b/strings/uca-dump.c @@ -762,7 +762,7 @@ int main(int ac, char **av) { char *comment; char *weight; - MY_DUCET_CHARS chr = {0}; + MY_DUCET_CHARS chr = {{0,0,0,0,0,0}, 0}; if (str[0] == '#') continue; @@ -803,7 +803,9 @@ int main(int ac, char **av) } else { - MY_DUCET_WEIGHT weights= {0}; + MY_DUCET_WEIGHT weights= {{{0,0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0,0}, + {0,0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0,0}}, + 0}; my_bool dummy; if (chr.length >= MY_UCA_MAX_CONTRACTION) {

1 0

[Commits] c5c307a: MDEV-28617 Crash with INSERT...SELECT using derived table in GROUP BY clause
by IgorBabaev 02 Aug '22

02 Aug '22

revision-id: c5c307abdd823d36be920e0937a96daed15af8c0 (mariadb-10.3.35-93-gc5c307a) parent(s): bd935a41060199a17019453d6e187e8edd7929ba author: Igor Babaev committer: Igor Babaev timestamp: 2022-08-01 20:52:10 -0700 message: MDEV-28617 Crash with INSERT...SELECT using derived table in GROUP BY clause This bug manifested itself for INSERT...SELECT and DELETE statements whose WHERE condition used an IN/ANY/ALL predicand or a EXISTS predicate with such grouping subquery that: - its GROUP BY clause could be eliminated, - the GROUP clause contained a subquery over a mergeable derived table referencing the updated table. The bug ultimately caused a server crash when the prepare phase of the statement processing was executed. This happened after removal redundant subqueries used in the eliminated GROUP BY clause from the statement tree. The function that excluded the subqueries from the did not do it properly. As a result the specification of any derived table contained in a removed subquery was not marked as excluded. Approved by Oleksandr Byelkin <sanja(a)mariadb.com> --- mysql-test/main/insert_select.result | 89 ++++++++++++++++++++++++++++++++++++ mysql-test/main/insert_select.test | 82 +++++++++++++++++++++++++++++++++ sql/sql_lex.cc | 7 +-- 3 files changed, 175 insertions(+), 3 deletions(-) diff --git a/mysql-test/main/insert_select.result b/mysql-test/main/insert_select.result index ea77053..3f9ac8c 100644 --- a/mysql-test/main/insert_select.result +++ b/mysql-test/main/insert_select.result @@ -954,3 +954,92 @@ ERROR 23000: Duplicate entry '-128' for key 'a' DROP TABLE t1, t2; DROP PROCEDURE p1; # End of 10.2 test +# +# MDEV-28617: INSERT ... SELECT with redundant IN subquery in GROUP BY +# list that uses mergeable derived table containing +# reference to target table +# +create table t1 (a int); +create table t2 (b int); +create table t3 (c int); +insert into t1 values (3), (1); +insert into t2 values (3), (2); +insert into t3 values (4), (2); +insert into t1 +select b from t2 +where b in (select c from t3 +group by (select * from (select a from t1) dt where a = 1)); +select * from t1; +a +3 +1 +2 +delete from t1; +insert into t1 values (3), (1); +insert into t1 +select b from t2 +where b >= any (select c from t3 +group by (select * from (select a from t1) dt where a = 1)); +select * from t1; +a +3 +1 +3 +2 +delete from t1; +insert into t1 values (3), (1); +insert into t1 +select b from t2 +where b <= all (select c from t3 +group by (select * from (select a from t1) dt where a = 1)); +select * from t1; +a +3 +1 +2 +delete from t1; +insert into t1 values (3), (1); +insert into t1 +select b from t2 +where exists (select c from t3 +group by (select * from (select a from t1) dt where a = 1)); +select * from t1; +a +3 +1 +3 +2 +delete from t1; +insert into t1 values (3), (1); +prepare stmt from " +insert into t1 +select b from t2 + where b in (select c from t3 + group by (select * from (select a from t1) dt where a = 1)); +"; +execute stmt; +select * from t1; +a +3 +1 +2 +delete from t1; +insert into t1 values (3), (1); +execute stmt; +select * from t1; +a +3 +1 +2 +delete from t1; +insert into t1 values (3), (1); +delete from t1 +where exists (select b from t2 +where b in (select c from t3 +group by (select * from (select a from t1) dt +where a = 1))); +select * from t1; +a +deallocate prepare stmt; +drop table t1,t2,t3; +# End of 10.3 test diff --git a/mysql-test/main/insert_select.test b/mysql-test/main/insert_select.test index 1f672ac..6baa7e4 100644 --- a/mysql-test/main/insert_select.test +++ b/mysql-test/main/insert_select.test @@ -514,3 +514,85 @@ DROP TABLE t1, t2; DROP PROCEDURE p1; --echo # End of 10.2 test + +--echo # +--echo # MDEV-28617: INSERT ... SELECT with redundant IN subquery in GROUP BY +--echo # list that uses mergeable derived table containing +--echo # reference to target table +--echo # + +create table t1 (a int); +create table t2 (b int); +create table t3 (c int); + +insert into t1 values (3), (1); +insert into t2 values (3), (2); +insert into t3 values (4), (2); + +insert into t1 +select b from t2 + where b in (select c from t3 + group by (select * from (select a from t1) dt where a = 1)); +select * from t1; + +delete from t1; +insert into t1 values (3), (1); + +insert into t1 +select b from t2 + where b >= any (select c from t3 + group by (select * from (select a from t1) dt where a = 1)); +select * from t1; + +delete from t1; +insert into t1 values (3), (1); + +insert into t1 +select b from t2 + where b <= all (select c from t3 + group by (select * from (select a from t1) dt where a = 1)); +select * from t1; + +delete from t1; +insert into t1 values (3), (1); + +insert into t1 +select b from t2 + where exists (select c from t3 + group by (select * from (select a from t1) dt where a = 1)); +select * from t1; + +delete from t1; +insert into t1 values (3), (1); + +prepare stmt from " +insert into t1 +select b from t2 + where b in (select c from t3 + group by (select * from (select a from t1) dt where a = 1)); +"; + +execute stmt; +select * from t1; + +delete from t1; +insert into t1 values (3), (1); + +execute stmt; +select * from t1; + +delete from t1; +insert into t1 values (3), (1); + +delete from t1 + where exists (select b from t2 + where b in (select c from t3 + group by (select * from (select a from t1) dt + where a = 1))); +select * from t1; + +deallocate prepare stmt; + +drop table t1,t2,t3; + +--echo # End of 10.3 test diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index e4c5b7c..3400e31 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -2530,6 +2530,7 @@ void st_select_lex_node::fast_exclude() for (; slave; slave= slave->next) slave->fast_exclude(); + prev= NULL; // to ensure correct behavior of st_select_lex_unit::is_excluded() } @@ -2604,9 +2605,7 @@ void st_select_lex_node::exclude_from_tree() */ void st_select_lex_node::exclude() { - /* exclude from global list */ - fast_exclude(); - /* exclude from other structures */ + /* exclude the node from the tree */ exclude_from_tree(); /* We do not need following statements, because prev pointer of first @@ -2614,6 +2613,8 @@ void st_select_lex_node::exclude() if (master->slave == this) master->slave= next; */ + /* exclude all nodes under this excluded node */ + fast_exclude(); }

1 0