database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-11-08 15:57:05 +01:00
parent 2a4c573339 6cfd2ba397
commit b83c379420
381 changed files with 10233 additions and 5782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/wsrep/include/check_galera_version.inc
View File

@@ -34,13 +34,13 @@ SELECT CAST(REGEXP_REPLACE(@ACTUAL_GALERA_VERSION,'^[\\d\\.]*\\.(\\d+).*','\\1')
#SELECT @ACTUAL_GALERA_MINOR_VERSION;
#SELECT @ACTUAL_GALERA_RELEASE_VERSION;
if (!`SELECT (@ACTUAL_GALERA_MAJOR_VERSION >= @GALERA_MAJOR_VERSION AND @ACTUAL_GALERA_MINOR_VERSION > @GALERA_MINOR_VERSION) OR
(@ACTUAL_GALERA_MAJOR_VERSION = @GALERA_MAJOR_VERSION AND
@ACTUAL_GALERA_MINOR_VERSION = @GALERA_MINOR_VERSION AND
if (!`SELECT (@ACTUAL_GALERA_MINOR_VERSION > @GALERA_MINOR_VERSION) OR
(@ACTUAL_GALERA_MINOR_VERSION = @GALERA_MINOR_VERSION AND
@ACTUAL_GALERA_RELEASE_VERSION >= @GALERA_RELEASE_VERSION)
`)
{
skip Test requires Galera library version >= $galera_version;
let actual_galera_version=`select @ACTUAL_GALERA_VERSION`;
skip needs galera >= $galera_version, got $actual_galera_version;
}
--echo # Correct Galera library found

61
mysql-test/suite/wsrep/r/wsrep_variables_sst_method.result Normal file
View File

@@ -0,0 +1,61 @@
SELECT @@wsrep_on;
@@wsrep_on
1
SET @wsrep_sst_method_saved = @@global.wsrep_sst_method;
/* test currently supported methods */
SET GLOBAL wsrep_sst_method=DEFAULT;
SELECT @@global.wsrep_sst_method;
@@global.wsrep_sst_method
rsync
SET GLOBAL wsrep_sst_method='rsync';
SELECT @@global.wsrep_sst_method;
@@global.wsrep_sst_method
rsync
SET GLOBAL wsrep_sst_method='mysqldump';
SELECT @@global.wsrep_sst_method;
@@global.wsrep_sst_method
mysqldump
SET GLOBAL wsrep_sst_method='mariabackup';
SELECT @@global.wsrep_sst_method;
@@global.wsrep_sst_method
mariabackup
SET GLOBAL wsrep_sst_method='backup';
SELECT @@global.wsrep_sst_method;
@@global.wsrep_sst_method
backup
SET GLOBAL wsrep_sst_method='backup1.sh';
SELECT @@global.wsrep_sst_method;
@@global.wsrep_sst_method
backup1.sh
SET GLOBAL wsrep_sst_method='my method';
ERROR 42000: Variable 'wsrep_sst_method' can't be set to the value of 'my method'
SELECT @@global.wsrep_sst_method;
@@global.wsrep_sst_method
backup1.sh
SHOW WARNINGS;
Level Code Message
Error 1231 Variable 'wsrep_sst_method' can't be set to the value of 'my method'
SET GLOBAL wsrep_sst_method='/method';
ERROR 42000: Variable 'wsrep_sst_method' can't be set to the value of '/method'
SELECT @@global.wsrep_sst_method;
@@global.wsrep_sst_method
backup1.sh
SHOW WARNINGS;
Level Code Message
Error 1231 Variable 'wsrep_sst_method' can't be set to the value of '/method'
SET GLOBAL wsrep_sst_method='method!';
ERROR 42000: Variable 'wsrep_sst_method' can't be set to the value of 'method!'
SELECT @@global.wsrep_sst_method;
@@global.wsrep_sst_method
backup1.sh
SHOW WARNINGS;
Level Code Message
Error 1231 Variable 'wsrep_sst_method' can't be set to the value of 'method!'
SET GLOBAL wsrep_sst_method='method;';
ERROR 42000: Variable 'wsrep_sst_method' can't be set to the value of 'method;'
SELECT @@global.wsrep_sst_method;
@@global.wsrep_sst_method
backup1.sh
SHOW WARNINGS;
Level Code Message
Error 1231 Variable 'wsrep_sst_method' can't be set to the value of 'method;'

7
mysql-test/suite/wsrep/t/wsrep_variables_sst_method.cnf Normal file
View File

@@ -0,0 +1,7 @@
!include ../my.cnf
[mysqld.1]
wsrep-on=ON
wsrep-cluster-address=gcomm://
wsrep-provider=@ENV.WSREP_PROVIDER
binlog-format=ROW

50
mysql-test/suite/wsrep/t/wsrep_variables_sst_method.test Normal file
View File

@@ -0,0 +1,50 @@
--source include/have_wsrep.inc
--source include/have_innodb.inc
SELECT @@wsrep_on;
SET @wsrep_sst_method_saved = @@global.wsrep_sst_method;
/* test currently supported methods */
SET GLOBAL wsrep_sst_method=DEFAULT;
SELECT @@global.wsrep_sst_method;
SET GLOBAL wsrep_sst_method='rsync';
SELECT @@global.wsrep_sst_method;
SET GLOBAL wsrep_sst_method='mysqldump';
SELECT @@global.wsrep_sst_method;
SET GLOBAL wsrep_sst_method='mariabackup';
SELECT @@global.wsrep_sst_method;
SET GLOBAL wsrep_sst_method='backup';
SELECT @@global.wsrep_sst_method;
SET GLOBAL wsrep_sst_method='backup1.sh';
SELECT @@global.wsrep_sst_method;
--error ER_WRONG_VALUE_FOR_VAR
SET GLOBAL wsrep_sst_method='my method';
SELECT @@global.wsrep_sst_method;
SHOW WARNINGS;
--error ER_WRONG_VALUE_FOR_VAR
SET GLOBAL wsrep_sst_method='/method';
SELECT @@global.wsrep_sst_method;
SHOW WARNINGS;
--error ER_WRONG_VALUE_FOR_VAR
SET GLOBAL wsrep_sst_method='method!';
SELECT @@global.wsrep_sst_method;
SHOW WARNINGS;
--error ER_WRONG_VALUE_FOR_VAR
SET GLOBAL wsrep_sst_method='method;';
SELECT @@global.wsrep_sst_method;
SHOW WARNINGS;
--disable_query_log
SET @@global.wsrep_sst_method = @wsrep_sst_method_saved;
--enable_query_log