database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-07 17:42:39 +03:00
Code Activity

MDEV-11016 wsrep_node_is_ready() check is too strict

Browse Source 
Problem:-
      The condition that checks for node readiness is too strict as it does
      not allow SELECTs even if these selects do not access any tables.
      For example,if we run
           SELECT 1;
      OR
           SELECT @@max_allowed_packet;
      Solution:-
      We need not to report this error when all_tables(lex->query_tables)
      is NULL:
This commit is contained in:
SachinSetiya
2016-12-01 11:24:04 +05:30
parent 41e11a8ac6
commit 52ea5ad865
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/suite/galera/r/galera_var_dirty_reads.result
View File

@@ -18,6 +18,19 @@ SET @@session.wsrep_dirty_reads=ON;
SELECT * FROM t1; SELECT * FROM t1;
i i
1 1
SET @@session.wsrep_dirty_reads=OFF;
SELECT 2;
2
2
SELECT @@max_allowed_packet;
@@max_allowed_packet
4194304
SELECT 2+2 from DUAL;
2+2
4
SELECT sysdate() from DUAL;
sysdate()
2016-10-28 23:13:06
SELECT * FROM t1; SELECT * FROM t1;
i i
1 1

7
mysql-test/suite/galera/t/galera_var_dirty_reads.test
View File

@@ -36,6 +36,13 @@ SET @@session.wsrep_dirty_reads=ON;
SELECT * FROM t1; SELECT * FROM t1;
#Select query which does not access table should be allowed MDEV-11016
SET @@session.wsrep_dirty_reads=OFF;
SELECT 2;
SELECT @@max_allowed_packet;
SELECT 2+2 from DUAL;
SELECT sysdate() from DUAL;
--disable_query_log --disable_query_log
--eval SET @@global.wsrep_cluster_address = '$wsrep_cluster_address_saved' --eval SET @@global.wsrep_cluster_address = '$wsrep_cluster_address_saved'
--enable_query_log --enable_query_log

4
sql/sql_parse.cc
View File

@@ -2635,11 +2635,15 @@ mysql_execute_command(THD *thd)
/* /*
Bail out if DB snapshot has not been installed. We however, Bail out if DB snapshot has not been installed. We however,
allow SET and SHOW queries. allow SET and SHOW queries.
SHOW and SELECT queries (only if wsrep_dirty_reads is set or when it
does not access ant table)
*/ */
if (thd->variables.wsrep_on && !thd->wsrep_applier && !wsrep_ready && if (thd->variables.wsrep_on && !thd->wsrep_applier && !wsrep_ready &&
lex->sql_command != SQLCOM_SET_OPTION && lex->sql_command != SQLCOM_SET_OPTION &&
!(thd->variables.wsrep_dirty_reads && !(thd->variables.wsrep_dirty_reads &&
lex->sql_command == SQLCOM_SELECT) && lex->sql_command == SQLCOM_SELECT) &&
!(lex->sql_command == SQLCOM_SELECT &&
!all_table) &&
!wsrep_is_show_query(lex->sql_command)) !wsrep_is_show_query(lex->sql_command))
{ {
my_message(ER_UNKNOWN_COM_ERROR, my_message(ER_UNKNOWN_COM_ERROR,