diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 19:39:37 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-06-12 19:39:37 +0300 |
| commit | 6e55236c0a72e8f49a240c4e080591994042b0e4 (patch) | |
| tree | 4bb2f438004db3dbba5f88f5e4b00aacfd5c1cec /sql/sql_parse.cc | |
| parent | aa59ecec89d89a29f7272352471a4064aa6db28c (diff) | |
| parent | 215d652c66474c4578b0476385d055e7feae2d3a (diff) | |
| download | mariadb-git-6e55236c0a72e8f49a240c4e080591994042b0e4.tar.gz | |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index be7408af77d..b2b2bfb5a27 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2915,6 +2915,7 @@ mysql_execute_command(THD *thd) { WSREP_SYNC_WAIT(thd, WSREP_SYNC_WAIT_BEFORE_SHOW); execute_show_status(thd, all_tables); + break; } case SQLCOM_SHOW_EXPLAIN: @@ -3961,7 +3962,7 @@ end_with_restore_list: case SQLCOM_INSERT_SELECT: { WSREP_SYNC_WAIT(thd, WSREP_SYNC_WAIT_BEFORE_INSERT_REPLACE); - select_result *sel_result; + select_insert *sel_result; bool explain= MY_TEST(lex->describe); DBUG_ASSERT(first_table == all_tables && first_table != 0); if (WSREP_CLIENT(thd) && |