diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 18:10:43 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 18:10:43 -0400 |
| commit | 0bf3ed12a5338f0db4b652f839fee93a28d39195 (patch) | |
| tree | c898e60249b0e3abdb334d2ad8fe1318babca072 | |
| parent | 0b98d2fd2ab337d95b6b502b15ea86368c441026 (diff) | |
| download | mariadb-git-0bf3ed12a5338f0db4b652f839fee93a28d39195.tar.gz | |
bzr merge -r4089..4091 codership/5.6
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 039e79c2acf..8da8fdf5c25 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2761,6 +2761,9 @@ mysql_execute_command(THD *thd) #endif case SQLCOM_SHOW_STATUS: { +#ifdef WITH_WSREP + if (WSREP_CLIENT(thd) && wsrep_causal_wait(thd)) goto error; +#endif /* WITH_WSREP */ execute_show_status(thd, all_tables); break; } |