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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
35756182
Commit
35756182
authored
Aug 25, 2016
by
Nirbhay Choubey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post merge fixes.
parent
90266e8a
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
63 additions
and
57 deletions
+63
-57
mysql-test/suite/galera/disabled.def
mysql-test/suite/galera/disabled.def
+2
-1
mysql-test/suite/galera/r/galera_roles.result
mysql-test/suite/galera/r/galera_roles.result
+8
-8
mysql-test/suite/galera/t/MW-259.test
mysql-test/suite/galera/t/MW-259.test
+1
-1
mysql-test/suite/galera/t/galera_rsu_wsrep_desync.test
mysql-test/suite/galera/t/galera_rsu_wsrep_desync.test
+1
-1
mysql-test/suite/sys_vars/r/sysvars_wsrep.result
mysql-test/suite/sys_vars/r/sysvars_wsrep.result
+7
-7
mysql-test/suite/sys_vars/r/wsrep_desync_basic.result
mysql-test/suite/sys_vars/r/wsrep_desync_basic.result
+0
-4
mysql-test/suite/sys_vars/r/wsrep_max_ws_size_basic.result
mysql-test/suite/sys_vars/r/wsrep_max_ws_size_basic.result
+10
-17
mysql-test/suite/sys_vars/t/wsrep_max_ws_size_basic.test
mysql-test/suite/sys_vars/t/wsrep_max_ws_size_basic.test
+6
-9
mysql-test/suite/wsrep/r/variables.result
mysql-test/suite/wsrep/r/variables.result
+0
-2
sql/sys_vars.cc
sql/sys_vars.cc
+2
-2
sql/wsrep_mysqld.h
sql/wsrep_mysqld.h
+3
-0
sql/wsrep_var.cc
sql/wsrep_var.cc
+21
-5
sql/wsrep_var.h
sql/wsrep_var.h
+2
-0
No files found.
mysql-test/suite/galera/disabled.def
View file @
35756182
...
@@ -28,4 +28,5 @@ galera_flush : mysql-wsrep/issues/229
...
@@ -28,4 +28,5 @@ galera_flush : mysql-wsrep/issues/229
galera_transaction_read_only : mysql-wsrep/issues/229
galera_transaction_read_only : mysql-wsrep/issues/229
galera_gcs_fragment : Incorrect arguments to SET
galera_gcs_fragment : Incorrect arguments to SET
galera_flush_local : Fails sporadically
galera_flush_local : Fails sporadically
galera_binlog_stmt_autoinc : TODO: investigate
galera_binlog_stmt_autoinc : TODO: investigate
\ No newline at end of file
galera_concurrent_ctas : Test times out, investigate
mysql-test/suite/galera/r/galera_roles.result
View file @
35756182
...
@@ -170,10 +170,10 @@ localhost foo role3 Y
...
@@ -170,10 +170,10 @@ localhost foo role3 Y
localhost root role1 Y
localhost root role1 Y
localhost root role2 Y
localhost root role2 Y
SELECT * FROM INFORMATION_SCHEMA.APPLICABLE_ROLES;
SELECT * FROM INFORMATION_SCHEMA.APPLICABLE_ROLES;
GRANTEE ROLE_NAME IS_GRANTABLE
GRANTEE ROLE_NAME IS_GRANTABLE
IS_DEFAULT
role1 role4 YES
role1 role4 YES
NULL
root@localhost role1 YES
root@localhost role1 YES
NO
root@localhost role2 YES
root@localhost role2 YES
NO
# On node_2
# On node_2
SELECT * FROM mysql.roles_mapping;
SELECT * FROM mysql.roles_mapping;
...
@@ -183,10 +183,10 @@ localhost foo role3 Y
...
@@ -183,10 +183,10 @@ localhost foo role3 Y
localhost root role1 Y
localhost root role1 Y
localhost root role2 Y
localhost root role2 Y
SELECT * FROM INFORMATION_SCHEMA.APPLICABLE_ROLES;
SELECT * FROM INFORMATION_SCHEMA.APPLICABLE_ROLES;
GRANTEE ROLE_NAME IS_GRANTABLE
GRANTEE ROLE_NAME IS_GRANTABLE
IS_DEFAULT
role1 role4 YES
role1 role4 YES
NULL
root@localhost role1 YES
root@localhost role1 YES
NO
root@localhost role2 YES
root@localhost role2 YES
NO
DROP ROLE role1;
DROP ROLE role1;
DROP ROLE role2;
DROP ROLE role2;
DROP ROLE role3;
DROP ROLE role3;
...
...
mysql-test/suite/galera/t/MW-259.test
View file @
35756182
...
@@ -24,7 +24,7 @@ SET DEBUG_SYNC = 'alter_table_before_open_tables WAIT_FOR continue';
...
@@ -24,7 +24,7 @@ SET DEBUG_SYNC = 'alter_table_before_open_tables WAIT_FOR continue';
--
connection
node_1b
--
connection
node_1b
--
sleep
2
--
sleep
2
--
let
$wait_condition
=
SELECT
COUNT
(
*
)
=
1
FROM
INFORMATION_SCHEMA
.
PROCESSLIST
WHERE
STATE
=
'exit open_tables()'
and
INFO
=
'SET GLOBAL wsrep_desync=1'
--
let
$wait_condition
=
SELECT
COUNT
(
*
)
=
1
FROM
INFORMATION_SCHEMA
.
PROCESSLIST
WHERE
INFO
=
'SET GLOBAL wsrep_desync=1'
--
source
include
/
wait_condition
.
inc
--
source
include
/
wait_condition
.
inc
SET
DEBUG_SYNC
=
'now SIGNAL continue'
;
SET
DEBUG_SYNC
=
'now SIGNAL continue'
;
...
...
mysql-test/suite/galera/t/galera_rsu_wsrep_desync.test
View file @
35756182
...
@@ -60,7 +60,7 @@ SET DEBUG_SYNC = 'alter_table_before_create_table_no_lock WAIT_FOR continue';
...
@@ -60,7 +60,7 @@ SET DEBUG_SYNC = 'alter_table_before_create_table_no_lock WAIT_FOR continue';
--
connection
node_1b
--
connection
node_1b
--
sleep
2
--
sleep
2
--
let
$wait_condition
=
SELECT
COUNT
(
*
)
=
1
FROM
INFORMATION_SCHEMA
.
PROCESSLIST
WHERE
STATE
=
'exit open_tables()'
and
INFO
=
'SET GLOBAL wsrep_desync=1'
--
let
$wait_condition
=
SELECT
COUNT
(
*
)
=
1
FROM
INFORMATION_SCHEMA
.
PROCESSLIST
WHERE
INFO
=
'SET GLOBAL wsrep_desync=1'
--
source
include
/
wait_condition
.
inc
--
source
include
/
wait_condition
.
inc
SET
DEBUG_SYNC
=
'now SIGNAL continue'
;
SET
DEBUG_SYNC
=
'now SIGNAL continue'
;
...
...
mysql-test/suite/sys_vars/r/sysvars_wsrep.result
View file @
35756182
...
@@ -241,13 +241,13 @@ READ_ONLY NO
...
@@ -241,13 +241,13 @@ READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME WSREP_MAX_WS_ROWS
VARIABLE_NAME WSREP_MAX_WS_ROWS
SESSION_VALUE NULL
SESSION_VALUE NULL
GLOBAL_VALUE
131072
GLOBAL_VALUE
0
GLOBAL_VALUE_ORIGIN COMPILE-TIME
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE
131072
DEFAULT_VALUE
0
VARIABLE_SCOPE GLOBAL
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Max number of rows in write set
VARIABLE_COMMENT Max number of rows in write set
NUMERIC_MIN_VALUE
1
NUMERIC_MIN_VALUE
0
NUMERIC_MAX_VALUE 1048576
NUMERIC_MAX_VALUE 1048576
NUMERIC_BLOCK_SIZE 1
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
ENUM_VALUE_LIST NULL
...
@@ -255,14 +255,14 @@ READ_ONLY NO
...
@@ -255,14 +255,14 @@ READ_ONLY NO
COMMAND_LINE_ARGUMENT REQUIRED
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME WSREP_MAX_WS_SIZE
VARIABLE_NAME WSREP_MAX_WS_SIZE
SESSION_VALUE NULL
SESSION_VALUE NULL
GLOBAL_VALUE
1073741824
GLOBAL_VALUE
2147483647
GLOBAL_VALUE_ORIGIN COMPILE-TIME
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE
1073741824
DEFAULT_VALUE
2147483647
VARIABLE_SCOPE GLOBAL
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT Max write set size (bytes)
VARIABLE_COMMENT Max write set size (bytes)
NUMERIC_MIN_VALUE 1024
NUMERIC_MIN_VALUE 1024
NUMERIC_MAX_VALUE
4294901759
NUMERIC_MAX_VALUE
2147483647
NUMERIC_BLOCK_SIZE 1
NUMERIC_BLOCK_SIZE 1
ENUM_VALUE_LIST NULL
ENUM_VALUE_LIST NULL
READ_ONLY NO
READ_ONLY NO
...
@@ -367,7 +367,7 @@ READ_ONLY NO
...
@@ -367,7 +367,7 @@ READ_ONLY NO
COMMAND_LINE_ARGUMENT OPTIONAL
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME WSREP_PATCH_VERSION
VARIABLE_NAME WSREP_PATCH_VERSION
SESSION_VALUE NULL
SESSION_VALUE NULL
GLOBAL_VALUE wsrep_25.1
3
GLOBAL_VALUE wsrep_25.1
6
GLOBAL_VALUE_ORIGIN COMPILE-TIME
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL
VARIABLE_SCOPE GLOBAL
...
...
mysql-test/suite/sys_vars/r/wsrep_desync_basic.result
View file @
35756182
...
@@ -24,8 +24,6 @@ SELECT @@global.wsrep_desync;
...
@@ -24,8 +24,6 @@ SELECT @@global.wsrep_desync;
# valid values
# valid values
SET @@global.wsrep_desync='OFF';
SET @@global.wsrep_desync='OFF';
Warnings:
Warning 1231 'wsrep_desync' is already OFF.
SELECT @@global.wsrep_desync;
SELECT @@global.wsrep_desync;
@@global.wsrep_desync
@@global.wsrep_desync
0
0
...
@@ -35,8 +33,6 @@ SELECT @@global.wsrep_desync;
...
@@ -35,8 +33,6 @@ SELECT @@global.wsrep_desync;
@@global.wsrep_desync
@@global.wsrep_desync
0
0
SET @@global.wsrep_desync=default;
SET @@global.wsrep_desync=default;
Warnings:
Warning 1231 'wsrep_desync' is already OFF.
SELECT @@global.wsrep_desync;
SELECT @@global.wsrep_desync;
@@global.wsrep_desync
@@global.wsrep_desync
0
0
...
...
mysql-test/suite/sys_vars/r/wsrep_max_ws_size_basic.result
View file @
35756182
#
#
# wsrep_max_ws_size
# wsrep_max_ws_size
#
#
# save the initial value
SET @wsrep_max_ws_size_global_saved = @@global.wsrep_max_ws_size;
SET @wsrep_provider_options_saved = @@global.wsrep_provider_options;
# default
# default
SELECT @@global.wsrep_max_ws_size;
SELECT @@global.wsrep_max_ws_size;
@@global.wsrep_max_ws_size
@@global.wsrep_max_ws_size
...
@@ -13,28 +10,29 @@ SELECT @@global.wsrep_max_ws_size;
...
@@ -13,28 +10,29 @@ SELECT @@global.wsrep_max_ws_size;
SELECT @@session.wsrep_max_ws_size;
SELECT @@session.wsrep_max_ws_size;
ERROR HY000: Variable 'wsrep_max_ws_size' is a GLOBAL variable
ERROR HY000: Variable 'wsrep_max_ws_size' is a GLOBAL variable
SET @@global.wsrep_max_ws_size=1;
SET @@global.wsrep_max_ws_size=1;
Warnings:
ERROR HY000: WSREP (galera) not started
Warning 1292 Truncated incorrect wsrep_max_ws_size value: '1'
SELECT @@global.wsrep_max_ws_size;
SELECT @@global.wsrep_max_ws_size;
@@global.wsrep_max_ws_size
@@global.wsrep_max_ws_size
1024
2147483647
# valid values
# valid values
SET @@global.wsrep_max_ws_size=1073741824;
SET @@global.wsrep_max_ws_size=1073741824;
ERROR HY000: WSREP (galera) not started
SELECT @@global.wsrep_max_ws_size;
SELECT @@global.wsrep_max_ws_size;
@@global.wsrep_max_ws_size
@@global.wsrep_max_ws_size
1073741824
2147483647
SET @@global.wsrep_max_ws_size=1073741825;
SET @@global.wsrep_max_ws_size=1073741825;
ERROR HY000: WSREP (galera) not started
SELECT @@global.wsrep_max_ws_size;
SELECT @@global.wsrep_max_ws_size;
@@global.wsrep_max_ws_size
@@global.wsrep_max_ws_size
1073741825
2147483647
SET @@global.wsrep_max_ws_size=0;
SET @@global.wsrep_max_ws_size=0;
Warnings:
ERROR HY000: WSREP (galera) not started
Warning 1292 Truncated incorrect wsrep_max_ws_size value: '0'
SELECT @@global.wsrep_max_ws_size;
SELECT @@global.wsrep_max_ws_size;
@@global.wsrep_max_ws_size
@@global.wsrep_max_ws_size
1024
2147483647
SET @@global.wsrep_max_ws_size=default;
SET @@global.wsrep_max_ws_size=default;
ERROR HY000: WSREP (galera) not started
SELECT @global.wsrep_max_ws_size;
SELECT @global.wsrep_max_ws_size;
@global.wsrep_max_ws_size
@global.wsrep_max_ws_size
NULL
NULL
...
@@ -48,13 +46,8 @@ SELECT @global.wsrep_max_ws_size;
...
@@ -48,13 +46,8 @@ SELECT @global.wsrep_max_ws_size;
@global.wsrep_max_ws_size
@global.wsrep_max_ws_size
NULL
NULL
SET @@global.wsrep_max_ws_size=-1;
SET @@global.wsrep_max_ws_size=-1;
Warnings:
ERROR HY000: WSREP (galera) not started
Warning 1292 Truncated incorrect wsrep_max_ws_size value: '-1'
SELECT @global.wsrep_max_ws_size;
SELECT @global.wsrep_max_ws_size;
@global.wsrep_max_ws_size
@global.wsrep_max_ws_size
NULL
NULL
# restore the initial value
SET @@global.wsrep_max_ws_size = @wsrep_max_ws_size_global_saved;
SET @@global.wsrep_provider_options = @wsrep_provider_options_saved;
# End of test
# End of test
mysql-test/suite/sys_vars/t/wsrep_max_ws_size_basic.test
View file @
35756182
...
@@ -4,10 +4,6 @@
...
@@ -4,10 +4,6 @@
--
echo
# wsrep_max_ws_size
--
echo
# wsrep_max_ws_size
--
echo
#
--
echo
#
--
echo
# save the initial value
SET
@
wsrep_max_ws_size_global_saved
=
@@
global
.
wsrep_max_ws_size
;
SET
@
wsrep_provider_options_saved
=
@@
global
.
wsrep_provider_options
;
--
echo
# default
--
echo
# default
SELECT
@@
global
.
wsrep_max_ws_size
;
SELECT
@@
global
.
wsrep_max_ws_size
;
...
@@ -15,17 +11,22 @@ SELECT @@global.wsrep_max_ws_size;
...
@@ -15,17 +11,22 @@ SELECT @@global.wsrep_max_ws_size;
--
echo
# scope
--
echo
# scope
--
error
ER_INCORRECT_GLOBAL_LOCAL_VAR
--
error
ER_INCORRECT_GLOBAL_LOCAL_VAR
SELECT
@@
session
.
wsrep_max_ws_size
;
SELECT
@@
session
.
wsrep_max_ws_size
;
--
error
ER_WRONG_ARGUMENTS
SET
@@
global
.
wsrep_max_ws_size
=
1
;
SET
@@
global
.
wsrep_max_ws_size
=
1
;
SELECT
@@
global
.
wsrep_max_ws_size
;
SELECT
@@
global
.
wsrep_max_ws_size
;
--
echo
--
echo
--
echo
# valid values
--
echo
# valid values
--
error
ER_WRONG_ARGUMENTS
SET
@@
global
.
wsrep_max_ws_size
=
1073741824
;
SET
@@
global
.
wsrep_max_ws_size
=
1073741824
;
SELECT
@@
global
.
wsrep_max_ws_size
;
SELECT
@@
global
.
wsrep_max_ws_size
;
--
error
ER_WRONG_ARGUMENTS
SET
@@
global
.
wsrep_max_ws_size
=
1073741825
;
SET
@@
global
.
wsrep_max_ws_size
=
1073741825
;
SELECT
@@
global
.
wsrep_max_ws_size
;
SELECT
@@
global
.
wsrep_max_ws_size
;
--
error
ER_WRONG_ARGUMENTS
SET
@@
global
.
wsrep_max_ws_size
=
0
;
SET
@@
global
.
wsrep_max_ws_size
=
0
;
SELECT
@@
global
.
wsrep_max_ws_size
;
SELECT
@@
global
.
wsrep_max_ws_size
;
--
error
ER_WRONG_ARGUMENTS
SET
@@
global
.
wsrep_max_ws_size
=
default
;
SET
@@
global
.
wsrep_max_ws_size
=
default
;
SELECT
@
global
.
wsrep_max_ws_size
;
SELECT
@
global
.
wsrep_max_ws_size
;
...
@@ -36,12 +37,8 @@ SET @@global.wsrep_max_ws_size=NULL;
...
@@ -36,12 +37,8 @@ SET @@global.wsrep_max_ws_size=NULL;
--
error
ER_WRONG_TYPE_FOR_VAR
--
error
ER_WRONG_TYPE_FOR_VAR
SET
@@
global
.
wsrep_max_ws_size
=
'junk'
;
SET
@@
global
.
wsrep_max_ws_size
=
'junk'
;
SELECT
@
global
.
wsrep_max_ws_size
;
SELECT
@
global
.
wsrep_max_ws_size
;
--
error
ER_WRONG_ARGUMENTS
SET
@@
global
.
wsrep_max_ws_size
=-
1
;
SET
@@
global
.
wsrep_max_ws_size
=-
1
;
SELECT
@
global
.
wsrep_max_ws_size
;
SELECT
@
global
.
wsrep_max_ws_size
;
--
echo
--
echo
# restore the initial value
SET
@@
global
.
wsrep_max_ws_size
=
@
wsrep_max_ws_size_global_saved
;
SET
@@
global
.
wsrep_provider_options
=
@
wsrep_provider_options_saved
;
--
echo
# End of test
--
echo
# End of test
mysql-test/suite/wsrep/r/variables.result
View file @
35756182
...
@@ -36,7 +36,6 @@ wsrep_commit_oooe #
...
@@ -36,7 +36,6 @@ wsrep_commit_oooe #
wsrep_commit_oool #
wsrep_commit_oool #
wsrep_commit_window #
wsrep_commit_window #
wsrep_connected #
wsrep_connected #
wsrep_debug_sync_waiters #
wsrep_flow_control_paused #
wsrep_flow_control_paused #
wsrep_flow_control_paused_ns #
wsrep_flow_control_paused_ns #
wsrep_flow_control_recv #
wsrep_flow_control_recv #
...
@@ -92,7 +91,6 @@ wsrep_commit_oooe #
...
@@ -92,7 +91,6 @@ wsrep_commit_oooe #
wsrep_commit_oool #
wsrep_commit_oool #
wsrep_commit_window #
wsrep_commit_window #
wsrep_connected #
wsrep_connected #
wsrep_debug_sync_waiters #
wsrep_flow_control_paused #
wsrep_flow_control_paused #
wsrep_flow_control_paused_ns #
wsrep_flow_control_paused_ns #
wsrep_flow_control_recv #
wsrep_flow_control_recv #
...
...
sql/sys_vars.cc
View file @
35756182
...
@@ -4865,8 +4865,8 @@ static Sys_var_ulong Sys_wsrep_max_ws_size (
...
@@ -4865,8 +4865,8 @@ static Sys_var_ulong Sys_wsrep_max_ws_size (
"wsrep_max_ws_size"
,
"Max write set size (bytes)"
,
"wsrep_max_ws_size"
,
"Max write set size (bytes)"
,
GLOBAL_VAR
(
wsrep_max_ws_size
),
CMD_LINE
(
REQUIRED_ARG
),
GLOBAL_VAR
(
wsrep_max_ws_size
),
CMD_LINE
(
REQUIRED_ARG
),
VALID_RANGE
(
1024
,
WSREP_MAX_WS_SIZE
),
DEFAULT
(
WSREP_MAX_WS_SIZE
),
VALID_RANGE
(
1024
,
WSREP_MAX_WS_SIZE
),
DEFAULT
(
WSREP_MAX_WS_SIZE
),
BLOCK_SIZE
(
1
),
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
,
ON_CHECK
(
0
),
BLOCK_SIZE
(
1
),
NO_MUTEX_GUARD
,
NOT_IN_BINLOG
,
ON_UPDATE
(
wsrep_max_ws_size_update
));
ON_
CHECK
(
wsrep_max_ws_size_check
),
ON_
UPDATE
(
wsrep_max_ws_size_update
));
static
Sys_var_ulong
Sys_wsrep_max_ws_rows
(
static
Sys_var_ulong
Sys_wsrep_max_ws_rows
(
"wsrep_max_ws_rows"
,
"Max number of rows in write set"
,
"wsrep_max_ws_rows"
,
"Max number of rows in write set"
,
...
...
sql/wsrep_mysqld.h
View file @
35756182
...
@@ -170,6 +170,9 @@ extern void wsrep_prepend_PATH (const char* path);
...
@@ -170,6 +170,9 @@ extern void wsrep_prepend_PATH (const char* path);
extern
wsrep_seqno_t
wsrep_locked_seqno
;
extern
wsrep_seqno_t
wsrep_locked_seqno
;
#define WSREP_ON \
#define WSREP_ON \
(global_system_variables.wsrep_on)
#define WSREP_ON_NEW \
((global_system_variables.wsrep_on) && \
((global_system_variables.wsrep_on) && \
wsrep_provider && \
wsrep_provider && \
strcmp(wsrep_provider, WSREP_NONE))
strcmp(wsrep_provider, WSREP_NONE))
...
...
sql/wsrep_var.cc
View file @
35756182
...
@@ -195,6 +195,8 @@ end:
...
@@ -195,6 +195,8 @@ end:
static
bool
refresh_provider_options
()
static
bool
refresh_provider_options
()
{
{
DBUG_ASSERT
(
wsrep
);
WSREP_DEBUG
(
"refresh_provider_options: %s"
,
WSREP_DEBUG
(
"refresh_provider_options: %s"
,
(
wsrep_provider_options
)
?
wsrep_provider_options
:
"null"
);
(
wsrep_provider_options
)
?
wsrep_provider_options
:
"null"
);
char
*
opts
=
wsrep
->
options_get
(
wsrep
);
char
*
opts
=
wsrep
->
options_get
(
wsrep
);
...
@@ -318,18 +320,18 @@ void wsrep_provider_init (const char* value)
...
@@ -318,18 +320,18 @@ void wsrep_provider_init (const char* value)
}
}
bool
wsrep_provider_options_check
(
sys_var
*
self
,
THD
*
thd
,
set_var
*
var
)
bool
wsrep_provider_options_check
(
sys_var
*
self
,
THD
*
thd
,
set_var
*
var
)
{
return
0
;
}
bool
wsrep_provider_options_update
(
sys_var
*
self
,
THD
*
thd
,
enum_var_type
type
)
{
{
if
(
wsrep
==
NULL
)
if
(
wsrep
==
NULL
)
{
{
my_message
(
ER_WRONG_ARGUMENTS
,
"WSREP (galera) not started"
,
MYF
(
0
));
my_message
(
ER_WRONG_ARGUMENTS
,
"WSREP (galera) not started"
,
MYF
(
0
));
return
true
;
return
true
;
}
}
return
false
;
}
bool
wsrep_provider_options_update
(
sys_var
*
self
,
THD
*
thd
,
enum_var_type
type
)
{
DBUG_ASSERT
(
wsrep
);
wsrep_status_t
ret
=
wsrep
->
options_set
(
wsrep
,
wsrep_provider_options
);
wsrep_status_t
ret
=
wsrep
->
options_set
(
wsrep
,
wsrep_provider_options
);
if
(
ret
!=
WSREP_OK
)
if
(
ret
!=
WSREP_OK
)
{
{
...
@@ -522,6 +524,12 @@ bool wsrep_slave_threads_update (sys_var *self, THD* thd, enum_var_type type)
...
@@ -522,6 +524,12 @@ bool wsrep_slave_threads_update (sys_var *self, THD* thd, enum_var_type type)
bool
wsrep_desync_check
(
sys_var
*
self
,
THD
*
thd
,
set_var
*
var
)
bool
wsrep_desync_check
(
sys_var
*
self
,
THD
*
thd
,
set_var
*
var
)
{
{
if
(
wsrep
==
NULL
)
{
my_message
(
ER_WRONG_ARGUMENTS
,
"WSREP (galera) not started"
,
MYF
(
0
));
return
true
;
}
bool
new_wsrep_desync
=
(
bool
)
var
->
save_result
.
ulonglong_value
;
bool
new_wsrep_desync
=
(
bool
)
var
->
save_result
.
ulonglong_value
;
if
(
wsrep_desync
==
new_wsrep_desync
)
{
if
(
wsrep_desync
==
new_wsrep_desync
)
{
if
(
new_wsrep_desync
)
{
if
(
new_wsrep_desync
)
{
...
@@ -559,6 +567,12 @@ bool wsrep_desync_check (sys_var *self, THD* thd, set_var* var)
...
@@ -559,6 +567,12 @@ bool wsrep_desync_check (sys_var *self, THD* thd, set_var* var)
}
}
bool
wsrep_desync_update
(
sys_var
*
self
,
THD
*
thd
,
enum_var_type
type
)
bool
wsrep_desync_update
(
sys_var
*
self
,
THD
*
thd
,
enum_var_type
type
)
{
DBUG_ASSERT
(
wsrep
);
return
false
;
}
bool
wsrep_max_ws_size_check
(
sys_var
*
self
,
THD
*
thd
,
set_var
*
var
)
{
{
if
(
wsrep
==
NULL
)
if
(
wsrep
==
NULL
)
{
{
...
@@ -570,6 +584,8 @@ bool wsrep_desync_update (sys_var *self, THD* thd, enum_var_type type)
...
@@ -570,6 +584,8 @@ bool wsrep_desync_update (sys_var *self, THD* thd, enum_var_type type)
bool
wsrep_max_ws_size_update
(
sys_var
*
self
,
THD
*
thd
,
enum_var_type
)
bool
wsrep_max_ws_size_update
(
sys_var
*
self
,
THD
*
thd
,
enum_var_type
)
{
{
DBUG_ASSERT
(
wsrep
);
char
max_ws_size_opt
[
128
];
char
max_ws_size_opt
[
128
];
my_snprintf
(
max_ws_size_opt
,
sizeof
(
max_ws_size_opt
),
my_snprintf
(
max_ws_size_opt
,
sizeof
(
max_ws_size_opt
),
"repl.max_ws_size=%d"
,
wsrep_max_ws_size
);
"repl.max_ws_size=%d"
,
wsrep_max_ws_size
);
...
...
sql/wsrep_var.h
View file @
35756182
...
@@ -92,7 +92,9 @@ extern bool wsrep_slave_threads_update UPDATE_ARGS;
...
@@ -92,7 +92,9 @@ extern bool wsrep_slave_threads_update UPDATE_ARGS;
extern
bool
wsrep_desync_check
CHECK_ARGS
;
extern
bool
wsrep_desync_check
CHECK_ARGS
;
extern
bool
wsrep_desync_update
UPDATE_ARGS
;
extern
bool
wsrep_desync_update
UPDATE_ARGS
;
extern
bool
wsrep_max_ws_size_check
CHECK_ARGS
;
extern
bool
wsrep_max_ws_size_update
UPDATE_ARGS
;
extern
bool
wsrep_max_ws_size_update
UPDATE_ARGS
;
#else
/* WITH_WSREP */
#else
/* WITH_WSREP */
#define WSREP_NONE
#define WSREP_NONE
...
...
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