diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-02-13 14:35:37 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-02-13 14:35:37 +0200 |
| commit | fc8a164a53000cefe7944997a23637b076ca3d6d (patch) | |
| tree | 3c322d64446fa0fcf0cd09c8b820e62a59f20815 /sql/sql_parse.cc | |
| parent | 654e955b8c6a5372db0c2da31a4abedf7bb65f9e (diff) | |
| download | mariadb-git-bb.10.1-MDEV-14616.tar.gz | |
Refs MW-245 wsrep_dirty_reads and wsrep_reject_queries optionsbb.10.1-MDEV-14616
Merge missing changes for wsrep_reject_queries with test case.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 8f0fa80a3fe..13ae0907f0f 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -269,26 +269,27 @@ void init_update_queries(void) server_command_flags[COM_STATISTICS]= CF_SKIP_QUERY_ID | CF_SKIP_QUESTIONS | CF_SKIP_WSREP_CHECK; server_command_flags[COM_PING]= CF_SKIP_QUERY_ID | CF_SKIP_QUESTIONS | CF_SKIP_WSREP_CHECK; - server_command_flags[COM_QUIT]= CF_SKIP_WSREP_CHECK; - server_command_flags[COM_PROCESS_INFO]= CF_SKIP_WSREP_CHECK; - server_command_flags[COM_PROCESS_KILL]= CF_SKIP_WSREP_CHECK; - server_command_flags[COM_SHUTDOWN]= CF_SKIP_WSREP_CHECK; - server_command_flags[COM_SLEEP]= CF_SKIP_WSREP_CHECK; - server_command_flags[COM_TIME]= CF_SKIP_WSREP_CHECK; - server_command_flags[COM_END]= CF_SKIP_WSREP_CHECK; - - /* + /* COM_QUERY, COM_SET_OPTION and COM_STMT_XXX are allowed to pass the early COM_xxx filter, they're checked later in mysql_execute_command(). */ server_command_flags[COM_QUERY]= CF_SKIP_WSREP_CHECK; server_command_flags[COM_SET_OPTION]= CF_SKIP_WSREP_CHECK; server_command_flags[COM_STMT_PREPARE]= CF_SKIP_QUESTIONS | CF_SKIP_WSREP_CHECK; + server_command_flags[COM_STMT_FETCH]= CF_SKIP_WSREP_CHECK; server_command_flags[COM_STMT_CLOSE]= CF_SKIP_QUESTIONS | CF_SKIP_WSREP_CHECK; server_command_flags[COM_STMT_RESET]= CF_SKIP_QUESTIONS | CF_SKIP_WSREP_CHECK; server_command_flags[COM_STMT_EXECUTE]= CF_SKIP_WSREP_CHECK; server_command_flags[COM_STMT_SEND_LONG_DATA]= CF_SKIP_WSREP_CHECK; server_command_flags[COM_REGISTER_SLAVE]= CF_SKIP_WSREP_CHECK; + server_command_flags[COM_QUIT]|= CF_SKIP_WSREP_CHECK; + server_command_flags[COM_PROCESS_INFO]= CF_SKIP_WSREP_CHECK; + server_command_flags[COM_PROCESS_KILL]= CF_SKIP_WSREP_CHECK; + server_command_flags[COM_SHUTDOWN]= CF_SKIP_WSREP_CHECK; + server_command_flags[COM_SLEEP]= CF_SKIP_WSREP_CHECK; + server_command_flags[COM_TIME]= CF_SKIP_WSREP_CHECK; + server_command_flags[COM_INIT_DB]= CF_SKIP_WSREP_CHECK; + server_command_flags[COM_END]= CF_SKIP_WSREP_CHECK; /* Initialize the sql command flags array. */ memset(sql_command_flags, 0, sizeof(sql_command_flags)); |