diff options
| author | Sachin Setiya <sachinsetia1001@gmail.com> | 2016-12-14 13:57:05 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachinsetia1001@gmail.com> | 2016-12-14 13:57:05 +0530 |
| commit | ffdd1e9d888edc4e147c3b316a87468b000f8dd4 (patch) | |
| tree | 72d97d1834050c1535f0956760081520fb8e488c /mysql-test/suite | |
| parent | e156ea1b9517dd155f68f8d683704ecf5370346a (diff) | |
| download | mariadb-git-ffdd1e9d888edc4e147c3b316a87468b000f8dd4.tar.gz | |
Revert "MDEV-11016 wsrep_node_is_ready() check is too strict"
This reverts commit 52ea5ad865b4f6b4b37176296a3be0a716c5109a.
# 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
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_var_dirty_reads.result | 16 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_var_dirty_reads.test | 13 |
2 files changed, 0 insertions, 29 deletions
diff --git a/mysql-test/suite/galera/r/galera_var_dirty_reads.result b/mysql-test/suite/galera/r/galera_var_dirty_reads.result index c0ffb2d4860..6d703c8cf95 100644 --- a/mysql-test/suite/galera/r/galera_var_dirty_reads.result +++ b/mysql-test/suite/galera/r/galera_var_dirty_reads.result @@ -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 diff --git a/mysql-test/suite/galera/t/galera_var_dirty_reads.test b/mysql-test/suite/galera/t/galera_var_dirty_reads.test index 7a76a71a265..dfd8d5ecf29 100644 --- a/mysql-test/suite/galera/t/galera_var_dirty_reads.test +++ b/mysql-test/suite/galera/t/galera_var_dirty_reads.test @@ -36,19 +36,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 |