Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
25a9a3da
Commit
25a9a3da
authored
Dec 14, 2016
by
Sachin Setiya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "MDEV-11016 wsrep_node_is_ready() check is too strict"
This reverts commit
7ed5563b
.
parent
72cc73ce
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
24 deletions
+1
-24
mysql-test/suite/galera/r/galera_var_dirty_reads.result
mysql-test/suite/galera/r/galera_var_dirty_reads.result
+0
-13
mysql-test/suite/galera/t/galera_var_dirty_reads.test
mysql-test/suite/galera/t/galera_var_dirty_reads.test
+0
-7
sql/sql_parse.cc
sql/sql_parse.cc
+1
-4
No files found.
mysql-test/suite/galera/r/galera_var_dirty_reads.result
View file @
25a9a3da
...
...
@@ -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
...
...
mysql-test/suite/galera/t/galera_var_dirty_reads.test
View file @
25a9a3da
...
...
@@ -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
...
...
sql/sql_parse.cc
View file @
25a9a3da
...
...
@@ -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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment