diff options
| author | Sachin Setiya <sachinsetia1001@gmail.com> | 2016-12-14 08:39:36 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachinsetia1001@gmail.com> | 2016-12-14 08:39:36 +0530 |
| commit | 25a9a3da346b6d763cf77ce82b82c65f4b1769cb (patch) | |
| tree | 5109c6476e64f8737e089d80c2b21694dbc031b4 /sql/sql_parse.cc | |
| parent | 72cc73cea2e7071277b6a88bae0236cabf11788a (diff) | |
| download | mariadb-git-25a9a3da346b6d763cf77ce82b82c65f4b1769cb.tar.gz | |
Revert "MDEV-11016 wsrep_node_is_ready() check is too strict"
This reverts commit 7ed5563bbee301bf8217080dc78ea6a3e78e23a8.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7d5c59f77e3..5169b7c5573 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2650,15 +2650,12 @@ mysql_execute_command(THD *thd) /* Bail out if DB snapshot has not been installed. We however, allow SET, - SHOW and SELECT queries (only if wsrep_dirty_reads is set or when it - does not access any table). + SHOW and SELECT queries (only if wsrep_dirty_reads is set). */ if (lex->sql_command != SQLCOM_SET_OPTION && !wsrep_is_show_query(lex->sql_command) && !(thd->variables.wsrep_dirty_reads && lex->sql_command == SQLCOM_SELECT) && - !(lex->sql_command == SQLCOM_SELECT && - !all_tables) && !wsrep_node_is_ready(thd)) goto error; } |