diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 17:17:24 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 17:17:24 +0300 |
| commit | 098c0f2634a35e24e9eb0f06d3fba69d0d097657 (patch) | |
| tree | 8e6b460d1c8812d29444bf1bd7449e5871105215 /sql/sql_parse.cc | |
| parent | 5bf4dee36943cb4cc95d10863d469192de854800 (diff) | |
| parent | e5c4f4e590d7782ef938b436f84ae11b68e0af08 (diff) | |
| download | mariadb-git-098c0f2634a35e24e9eb0f06d3fba69d0d097657.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index bd35e473018..bd9ef39eaa2 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3389,6 +3389,7 @@ bool run_set_statement_if_requested(THD *thd, LEX *lex) { switch (v->var->option.var_type & GET_TYPE_MASK) { + case GET_BIT: case GET_BOOL: case GET_INT: case GET_LONG: @@ -4915,7 +4916,7 @@ mysql_execute_command(THD *thd) if (likely(!thd->is_fatal_error)) { result= new (thd->mem_root) multi_delete(thd, aux_tables, - lex->table_count); + lex->table_count_update); if (likely(result)) { if (unlikely(select_lex->vers_setup_conds(thd, aux_tables))) @@ -9813,12 +9814,12 @@ bool multi_delete_set_locks_and_link_aux_tables(LEX *lex) TABLE_LIST *target_tbl; DBUG_ENTER("multi_delete_set_locks_and_link_aux_tables"); - lex->table_count= 0; + lex->table_count_update= 0; for (target_tbl= lex->auxiliary_table_list.first; target_tbl; target_tbl= target_tbl->next_local) { - lex->table_count++; + lex->table_count_update++; /* All tables in aux_tables must be found in FROM PART */ TABLE_LIST *walk= multi_delete_table_match(lex, target_tbl, tables); if (!walk) |