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
98bebad6
Commit
98bebad6
authored
Aug 18, 2015
by
Nirbhay Choubey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for a typo.
parent
fe757e00
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
mysql-test/suite/wsrep/suite.pm
mysql-test/suite/wsrep/suite.pm
+2
-2
sql/mysqld.cc
sql/mysqld.cc
+2
-2
No files found.
mysql-test/suite/wsrep/suite.pm
View file @
98bebad6
...
@@ -25,8 +25,8 @@ return "No my_print_defaults" unless $epath;
...
@@ -25,8 +25,8 @@ return "No my_print_defaults" unless $epath;
push
@::global_suppressions
,
push
@::global_suppressions
,
(
(
qr(WSREP: Could not open saved state file for reading: )
,
qr(WSREP: Could not open saved state file for reading: )
,
qr(WSREP: option --wsrep-ca
su
al-reads is deprecated)
,
qr(WSREP: option --wsrep-ca
us
al-reads is deprecated)
,
qr(WSREP: --wsrep-ca
su
al-reads=ON takes precedence over --wsrep-sync-wait=0)
,
qr(WSREP: --wsrep-ca
us
al-reads=ON takes precedence over --wsrep-sync-wait=0)
,
qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|
,
qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|
,
);
);
...
...
sql/mysqld.cc
View file @
98bebad6
...
@@ -8764,10 +8764,10 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
...
@@ -8764,10 +8764,10 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
}
}
if
(
global_system_variables
.
wsrep_causal_reads
)
{
if
(
global_system_variables
.
wsrep_causal_reads
)
{
WSREP_WARN
(
"option --wsrep-ca
su
al-reads is deprecated"
);
WSREP_WARN
(
"option --wsrep-ca
us
al-reads is deprecated"
);
if
(
!
(
global_system_variables
.
wsrep_sync_wait
&
if
(
!
(
global_system_variables
.
wsrep_sync_wait
&
WSREP_SYNC_WAIT_BEFORE_READ
))
{
WSREP_SYNC_WAIT_BEFORE_READ
))
{
WSREP_WARN
(
"--wsrep-ca
su
al-reads=ON takes precedence over --wsrep-sync-wait=%u. "
WSREP_WARN
(
"--wsrep-ca
us
al-reads=ON takes precedence over --wsrep-sync-wait=%u. "
"WSREP_SYNC_WAIT_BEFORE_READ is on"
,
"WSREP_SYNC_WAIT_BEFORE_READ is on"
,
global_system_variables
.
wsrep_sync_wait
);
global_system_variables
.
wsrep_sync_wait
);
global_system_variables
.
wsrep_sync_wait
|=
WSREP_SYNC_WAIT_BEFORE_READ
;
global_system_variables
.
wsrep_sync_wait
|=
WSREP_SYNC_WAIT_BEFORE_READ
;
...
...
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