Revert " MDEV-11016 wsrep_node_is_ready() check is too strict"
This reverts commit 72fd15f7c31aa3e3705ae1b005a3247a985c5bb3. # Conflicts: # mysql-test/suite/galera/r/galera_var_dirty_reads.result # mysql-test/suite/galera/t/galera_var_dirty_reads.test
This commit is contained in:
parent
313a14f79e
commit
95422c445d
@ -18,22 +18,6 @@ SET @@session.wsrep_dirty_reads=ON;
|
||||
SELECT * FROM t1;
|
||||
i
|
||||
1
|
||||
#
|
||||
# MDEV-11016: wsrep_node_is_ready() check is too strict
|
||||
#
|
||||
SET @@session.wsrep_dirty_reads=OFF;
|
||||
SELECT 2;
|
||||
2
|
||||
2
|
||||
SELECT 2+2 from DUAL;
|
||||
2+2
|
||||
4
|
||||
SET @VAR=1;
|
||||
SELECT @VAR;
|
||||
@VAR
|
||||
1
|
||||
SELECT @@max_allowed_packet;
|
||||
SELECT SYSDATE() from DUAL;
|
||||
SELECT * FROM t1;
|
||||
i
|
||||
1
|
||||
|
@ -39,19 +39,6 @@ SET @@session.wsrep_dirty_reads=ON;
|
||||
|
||||
SELECT * FROM t1;
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-11016: wsrep_node_is_ready() check is too strict
|
||||
--echo #
|
||||
SET @@session.wsrep_dirty_reads=OFF;
|
||||
SELECT 2;
|
||||
SELECT 2+2 from DUAL;
|
||||
SET @VAR=1;
|
||||
SELECT @VAR;
|
||||
--disable_result_log
|
||||
SELECT @@max_allowed_packet;
|
||||
SELECT SYSDATE() from DUAL;
|
||||
--enable_result_log
|
||||
|
||||
--disable_query_log
|
||||
--eval SET @@global.wsrep_cluster_address = '$wsrep_cluster_address_saved'
|
||||
--enable_query_log
|
||||
|
@ -2388,15 +2388,11 @@ mysql_execute_command(THD *thd)
|
||||
/*
|
||||
Bail out if DB snapshot has not been installed. We however,
|
||||
allow SET and SHOW queries.
|
||||
SHOW and SELECT queries (only if wsrep_dirty_reads is set or when it
|
||||
does not access any table).
|
||||
*/
|
||||
if (thd->variables.wsrep_on && !thd->wsrep_applier && !wsrep_ready &&
|
||||
lex->sql_command != SQLCOM_SET_OPTION &&
|
||||
!(thd->variables.wsrep_dirty_reads &&
|
||||
lex->sql_command == SQLCOM_SELECT) &&
|
||||
!(lex->sql_command == SQLCOM_SELECT &&
|
||||
!all_tables) &&
|
||||
!wsrep_is_show_query(lex->sql_command))
|
||||
{
|
||||
#if DIRTY_HACK
|
||||
|
Loading…
x
Reference in New Issue
Block a user