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.7' into 10.8

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-02-04 14:50:25 +01:00
parent c0f5fd2754 9ed8deb656
commit 4fb2cb1a30
907 changed files with 20182 additions and 6211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/sys_vars/r/sysvars_innodb.result
View File

@@ -195,7 +195,7 @@ DEFAULT_VALUE 134217728
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BIGINT UNSIGNED
VARIABLE_COMMENT The size of the memory buffer InnoDB uses to cache data and indexes of its tables.
NUMERIC_MIN_VALUE 5242880
NUMERIC_MIN_VALUE 2097152
NUMERIC_MAX_VALUE 9223372036854775807
NUMERIC_BLOCK_SIZE 1048576
ENUM_VALUE_LIST NULL
@@ -1367,10 +1367,10 @@ READ_ONLY YES
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_READ_ONLY_COMPRESSED
SESSION_VALUE NULL
DEFAULT_VALUE ON
DEFAULT_VALUE OFF
VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE BOOLEAN
VARIABLE_COMMENT Make ROW_FORMAT=COMPRESSED tables read-only (ON by default)
VARIABLE_COMMENT Make ROW_FORMAT=COMPRESSED tables read-only
NUMERIC_MIN_VALUE NULL
NUMERIC_MAX_VALUE NULL
NUMERIC_BLOCK_SIZE NULL

2
mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
View File

@@ -1,5 +1,3 @@
--- ../../mysql-test/suite/sys_vars/r/sysvars_server_embedded.result 2021-05-11 19:44:57.048781628 +0530
+++ ../../mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.reject 2021-05-12 15:26:31.616449925 +0530
@@ -34,7 +34,7 @@
COMMAND_LINE_ARGUMENT REQUIRED
VARIABLE_NAME ARIA_BLOCK_SIZE

49
mysql-test/suite/sys_vars/r/wsrep_slave_threads_basic.result
View File

@@ -1,49 +0,0 @@
#
# wsrep_slave_threads
#
# save the initial value
SET @wsrep_slave_threads_global_saved = @@global.wsrep_slave_threads;
# default
SELECT @@global.wsrep_slave_threads;
@@global.wsrep_slave_threads
1
# scope
SELECT @@session.wsrep_slave_threads;
ERROR HY000: Variable 'wsrep_slave_threads' is a GLOBAL variable
SET @@global.wsrep_slave_threads=1;
SELECT @@global.wsrep_slave_threads;
@@global.wsrep_slave_threads
1
# valid values
SET @@global.wsrep_slave_threads=10;
SELECT @@global.wsrep_slave_threads;
@@global.wsrep_slave_threads
10
SET @@global.wsrep_slave_threads=0;
Warnings:
Warning 1292 Truncated incorrect wsrep_slave_threads value: '0'
SELECT @@global.wsrep_slave_threads;
@@global.wsrep_slave_threads
1
SET @@global.wsrep_slave_threads=default;
SELECT @global.wsrep_slave_threads;
@global.wsrep_slave_threads
NULL
# invalid values
SET @@global.wsrep_slave_threads=NULL;
ERROR 42000: Incorrect argument type to variable 'wsrep_slave_threads'
SET @@global.wsrep_slave_threads='junk';
ERROR 42000: Incorrect argument type to variable 'wsrep_slave_threads'
SET @@global.wsrep_slave_threads=-1;
Warnings:
Warning 1292 Truncated incorrect wsrep_slave_threads value: '-1'
SELECT @global.wsrep_slave_threads;
@global.wsrep_slave_threads
NULL
# restore the initial value
SET @@global.wsrep_slave_threads = @wsrep_slave_threads_global_saved;
# End of test