mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "MDEV-11016 wsrep_node_is_ready() check is too strict"

Browse source 
This reverts commit 7ed5563bbe.
This commit is contained in:
Sachin Setiya 2016-12-14 08:39:36 +05:30
parent 72cc73cea2
commit 25a9a3da34
3 changed files with 1 additions and 24 deletions
Show stats 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,19 +18,6 @@ SET @@session.wsrep_dirty_reads=ON;
SELECT * FROM t1;
i
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;
i
1

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

@ -36,13 +36,6 @@ SET @@session.wsrep_dirty_reads=ON;
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
--eval SET @@global.wsrep_cluster_address = '$wsrep_cluster_address_saved'
--enable_query_log

5
sql/sql_parse.cc
View file

@ -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;
}