Skip to content

Commit ffdd1e9

Browse files
committed
Revert "MDEV-11016 wsrep_node_is_ready() check is too strict"
This reverts commit 52ea5ad. # Conflicts: # mysql-test/suite/galera/r/galera_var_dirty_reads.result # mysql-test/suite/galera/t/galera_var_dirty_reads.test # sql/sql_parse.cc
1 parent e156ea1 commit ffdd1e9

File tree

3 files changed

+0
-33
lines changed

3 files changed

+0
-33
lines changed

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,6 @@ SET @@session.wsrep_dirty_reads=ON;
1818
SELECT * FROM t1;
1919
i
2020
1
21-
#
22-
# MDEV-11016: wsrep_node_is_ready() check is too strict
23-
#
24-
SET @@session.wsrep_dirty_reads=OFF;
25-
SELECT 2;
26-
2
27-
2
28-
SELECT 2+2 from DUAL;
29-
2+2
30-
4
31-
SET @VAR=1;
32-
SELECT @VAR;
33-
@VAR
34-
1
35-
SELECT @@max_allowed_packet;
36-
SELECT SYSDATE() from DUAL;
3721
SELECT * FROM t1;
3822
i
3923
1

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

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

3737
SELECT * FROM t1;
3838

39-
--echo #
40-
--echo # MDEV-11016: wsrep_node_is_ready() check is too strict
41-
--echo #
42-
SET @@session.wsrep_dirty_reads=OFF;
43-
SELECT 2;
44-
SELECT 2+2 from DUAL;
45-
SET @VAR=1;
46-
SELECT @VAR;
47-
--disable_result_log
48-
SELECT @@max_allowed_packet;
49-
SELECT SYSDATE() from DUAL;
50-
--enable_result_log
51-
5239
--disable_query_log
5340
--eval SET @@global.wsrep_cluster_address = '$wsrep_cluster_address_saved'
5441
--enable_query_log

sql/sql_parse.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2635,15 +2635,11 @@ mysql_execute_command(THD *thd)
26352635
/*
26362636
Bail out if DB snapshot has not been installed. We however,
26372637
allow SET and SHOW queries.
2638-
SHOW and SELECT queries (only if wsrep_dirty_reads is set or when it
2639-
does not access ant table)
26402638
*/
26412639
if (thd->variables.wsrep_on && !thd->wsrep_applier && !wsrep_ready &&
26422640
lex->sql_command != SQLCOM_SET_OPTION &&
26432641
!(thd->variables.wsrep_dirty_reads &&
26442642
lex->sql_command == SQLCOM_SELECT) &&
2645-
!(lex->sql_command == SQLCOM_SELECT &&
2646-
!all_tables) &&
26472643
!wsrep_is_show_query(lex->sql_command))
26482644
{
26492645
my_message(ER_UNKNOWN_COM_ERROR,

0 commit comments

Comments
 (0)