Skip to content

Commit 25a9a3d

Browse files
committed
Revert "MDEV-11016 wsrep_node_is_ready() check is too strict"
This reverts commit 7ed5563.
1 parent 72cc73c commit 25a9a3d

File tree

3 files changed

+1
-24
lines changed

3 files changed

+1
-24
lines changed

mysql-test/suite/galera/r/galera_var_dirty_reads.result

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,6 @@ SET @@session.wsrep_dirty_reads=ON;
1818
SELECT * FROM t1;
1919
i
2020
1
21-
SET @@session.wsrep_dirty_reads=OFF;
22-
SELECT 2;
23-
2
24-
2
25-
SELECT @@max_allowed_packet;
26-
@@max_allowed_packet
27-
4194304
28-
SELECT 2+2 from DUAL;
29-
2+2
30-
4
31-
SELECT sysdate() from DUAL;
32-
sysdate()
33-
2016-10-28 23:13:06
3421
SELECT * FROM t1;
3522
i
3623
1

mysql-test/suite/galera/t/galera_var_dirty_reads.test

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@ SET @@session.wsrep_dirty_reads=ON;
3636

3737
SELECT * FROM t1;
3838

39-
#Select query which does not access table should be allowed MDEV-11016
40-
SET @@session.wsrep_dirty_reads=OFF;
41-
SELECT 2;
42-
SELECT @@max_allowed_packet;
43-
SELECT 2+2 from DUAL;
44-
SELECT sysdate() from DUAL;
45-
4639
--disable_query_log
4740
--eval SET @@global.wsrep_cluster_address = '$wsrep_cluster_address_saved'
4841
--enable_query_log

sql/sql_parse.cc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2650,15 +2650,12 @@ mysql_execute_command(THD *thd)
26502650

26512651
/*
26522652
Bail out if DB snapshot has not been installed. We however, allow SET,
2653-
SHOW and SELECT queries (only if wsrep_dirty_reads is set or when it
2654-
does not access any table).
2653+
SHOW and SELECT queries (only if wsrep_dirty_reads is set).
26552654
*/
26562655
if (lex->sql_command != SQLCOM_SET_OPTION &&
26572656
!wsrep_is_show_query(lex->sql_command) &&
26582657
!(thd->variables.wsrep_dirty_reads &&
26592658
lex->sql_command == SQLCOM_SELECT) &&
2660-
!(lex->sql_command == SQLCOM_SELECT &&
2661-
!all_tables) &&
26622659
!wsrep_node_is_ready(thd))
26632660
goto error;
26642661
}

0 commit comments

Comments
 (0)