diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 09:43:13 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-07 09:43:13 +0200 |
| commit | b3c254339be29d3be24c16fa0c150ff8ebd0bfda (patch) | |
| tree | e1cebed6f3689750d4611dd8a12185c86054bb56 /sql/sql_parse.cc | |
| parent | 0751bfbcaf08c7c32de8d90b41b6c50ab525da6f (diff) | |
| parent | 9e27e53dfac1c911a593065a0fcadc5729957d29 (diff) | |
| download | mariadb-git-b3c254339be29d3be24c16fa0c150ff8ebd0bfda.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 3d0809f8785..2b8ea9265de 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1136,7 +1136,7 @@ static bool wsrep_tables_accessible_when_detached(const TABLE_LIST *tables) if (get_table_category(&db, &tn) < TABLE_CATEGORY_INFORMATION) return false; } - return true; + return tables != NULL; } static bool wsrep_command_no_result(char command) @@ -3687,6 +3687,8 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt) (sql_command_flags[lex->sql_command] & CF_CHANGES_DATA) == 0) && !wsrep_tables_accessible_when_detached(all_tables) && lex->sql_command != SQLCOM_SET_OPTION && + lex->sql_command != SQLCOM_CHANGE_DB && + !(lex->sql_command == SQLCOM_SELECT && !all_tables) && !wsrep_is_show_query(lex->sql_command)) { my_message(ER_UNKNOWN_COM_ERROR, |