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.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-05-19 20:55:37 +02:00
parent 7f8187bc43 2ae83affef
commit c07325f932
3893 changed files with 11766 additions and 6460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit,32bit.rdiff Normal file
View File

@@ -0,0 +1,11 @@
--- mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.result 2019-05-07 15:09:57.220599318 +0530
+++ mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.reject 2019-05-07 15:10:20.012718538 +0530
@@ -1,5 +1,7 @@
set global innodb_ft_result_cache_limit=5000000000;
+Warnings:
+Warning 1292 Truncated incorrect innodb_ft_result_cache_limit value: '5000000000'
select @@innodb_ft_result_cache_limit;
@@innodb_ft_result_cache_limit
-5000000000
+4294967295
set global innodb_ft_result_cache_limit=2000000000;

0
mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_64.result → mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit.result
View File

7
mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_32.result
View File

@@ -1,7 +0,0 @@
set global innodb_ft_result_cache_limit=5000000000;
Warnings:
Warning 1292 Truncated incorrect innodb_ft_result_cache_limit value: '5000000000'
select @@innodb_ft_result_cache_limit;
@@innodb_ft_result_cache_limit
4294967295
set global innodb_ft_result_cache_limit=2000000000;

4
mysql-test/suite/sys_vars/r/sysvars_innodb,32bit,xtradb.rdiff-disabled
View File

@@ -1214,8 +1214,8 @@
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.43
+GLOBAL_VALUE 5.6.42-84.2
-GLOBAL_VALUE 5.6.44
+GLOBAL_VALUE 5.6.43-84.3
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL

4
mysql-test/suite/sys_vars/r/sysvars_innodb,xtradb.rdiff-disabled
View File

@@ -684,8 +684,8 @@
COMMAND_LINE_ARGUMENT OPTIONAL
VARIABLE_NAME INNODB_VERSION
SESSION_VALUE NULL
-GLOBAL_VALUE 5.6.43
+GLOBAL_VALUE 5.6.42-84.2
-GLOBAL_VALUE 5.6.44
+GLOBAL_VALUE 5.6.43-84.3
GLOBAL_VALUE_ORIGIN COMPILE-TIME
DEFAULT_VALUE NULL
VARIABLE_SCOPE GLOBAL