1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mysql-5.1' into mysql-5.5

Browse Source 
Conflicts:
	mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
	mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result
	mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test
	mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test
	sql/mysqld.cc
This commit is contained in:
Jon Olav Hauglid 2015-03-19 12:06:55 +01:00
commit 120907c0a2
6 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
View File

@ -70,7 +70,7 @@ Warnings:
Warning 1292 Truncated incorrect transaction_alloc_block_size value: '135217728' Warning 1292 Truncated incorrect transaction_alloc_block_size value: '135217728'
SELECT @@global.transaction_alloc_block_size; SELECT @@global.transaction_alloc_block_size;
@@global.transaction_alloc_block_size @@global.transaction_alloc_block_size
134217728 131072
SET @@global.transaction_alloc_block_size = ON; SET @@global.transaction_alloc_block_size = ON;
ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size' ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
SET @@global.transaction_alloc_block_size = OFF; SET @@global.transaction_alloc_block_size = OFF;
@ -102,7 +102,7 @@ Warnings:
Warning 1292 Truncated incorrect transaction_alloc_block_size value: '135217728' Warning 1292 Truncated incorrect transaction_alloc_block_size value: '135217728'
SELECT @@session.transaction_alloc_block_size; SELECT @@session.transaction_alloc_block_size;
@@session.transaction_alloc_block_size @@session.transaction_alloc_block_size
134217728 131072
SET @@session.transaction_alloc_block_size = ON; SET @@session.transaction_alloc_block_size = ON;
ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size' ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
SET @@session.transaction_alloc_block_size = OFF; SET @@session.transaction_alloc_block_size = OFF;
@ -124,20 +124,22 @@ ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
SET @@session.transaction_alloc_block_size = 'test'; SET @@session.transaction_alloc_block_size = 'test';
ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size' ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
'#------------------FN_DYNVARS_005_06-----------------------#' '#------------------FN_DYNVARS_005_06-----------------------#'
SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='transaction_alloc_block_size'; WHERE VARIABLE_NAME='transaction_alloc_block_size';
@@global.transaction_alloc_block_size = VARIABLE_VALUE @@global.transaction_alloc_block_size = VARIABLE_VALUE
1 1
'#------------------FN_DYNVARS_005_07-----------------------#' '#------------------FN_DYNVARS_005_07-----------------------#'
SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='transaction_alloc_block_size'; WHERE VARIABLE_NAME='transaction_alloc_block_size';
@@session.transaction_alloc_block_size = VARIABLE_VALUE @@session.transaction_alloc_block_size = VARIABLE_VALUE
1 1
'#---------------------FN_DYNVARS_001_08----------------------#' '#---------------------FN_DYNVARS_001_08----------------------#'
SET @@transaction_alloc_block_size = 1024; SET @@transaction_alloc_block_size = 1024;
SET @@global.transaction_alloc_block_size = 134217728; SET @@global.transaction_alloc_block_size = 134217728;
Warnings:
Warning 1292 Truncated incorrect transaction_alloc_block_size value: '134217728'
SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size; SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
@@transaction_alloc_block_size = @@global.transaction_alloc_block_size @@transaction_alloc_block_size = @@global.transaction_alloc_block_size
0 0

10
mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result
View File

@ -114,16 +114,16 @@ Warnings:
Warning 1292 Truncated incorrect transaction_prealloc_size value: '135217728' Warning 1292 Truncated incorrect transaction_prealloc_size value: '135217728'
SELECT @@session.transaction_prealloc_size; SELECT @@session.transaction_prealloc_size;
@@session.transaction_prealloc_size @@session.transaction_prealloc_size
134217728 131072
'#------------------FN_DYNVARS_005_06-----------------------#' '#------------------FN_DYNVARS_005_06-----------------------#'
SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='transaction_prealloc_size'; WHERE VARIABLE_NAME='transaction_prealloc_size';
@@global.transaction_prealloc_size = VARIABLE_VALUE @@global.transaction_prealloc_size = VARIABLE_VALUE
1 1
'#------------------FN_DYNVARS_005_07-----------------------#' '#------------------FN_DYNVARS_005_07-----------------------#'
SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='transaction_prealloc_size'; WHERE VARIABLE_NAME='transaction_prealloc_size';
@@session.transaction_prealloc_size = VARIABLE_VALUE @@session.transaction_prealloc_size = VARIABLE_VALUE
1 1

14
mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test
View File

@ -5,7 +5,7 @@
# Access Type: Dynamic # # Access Type: Dynamic #
# Data Type: numeric # # Data Type: numeric #
# Default Value: 8192 # # Default Value: 8192 #
# Range: 1024-134217728 # # Range: 1024-131072 #
# # # #
# # # #
# Creation Date: 2008-02-14 # # Creation Date: 2008-02-14 #
@ -84,7 +84,7 @@ SELECT @@global.transaction_alloc_block_size;
################################################################### ###################################################################
# Change the value of variable to a valid value for SESSION Scope # # Change the value of variable to a valid value for SESSION Scope #
################################################################### ###################################################################
SET @@session.transaction_alloc_block_size = 1024; SET @@session.transaction_alloc_block_size = 1024;
SELECT @@session.transaction_alloc_block_size; SELECT @@session.transaction_alloc_block_size;
@ -159,8 +159,8 @@ SET @@session.transaction_alloc_block_size = 'test';
#################################################################### ####################################################################
SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='transaction_alloc_block_size'; WHERE VARIABLE_NAME='transaction_alloc_block_size';
--echo '#------------------FN_DYNVARS_005_07-----------------------#' --echo '#------------------FN_DYNVARS_005_07-----------------------#'
@ -168,8 +168,8 @@ WHERE VARIABLE_NAME='transaction_alloc_block_size';
# Check if the value in SESSION Table matches value in variable # # Check if the value in SESSION Table matches value in variable #
#################################################################### ####################################################################
SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='transaction_alloc_block_size'; WHERE VARIABLE_NAME='transaction_alloc_block_size';
@ -181,7 +181,7 @@ WHERE VARIABLE_NAME='transaction_alloc_block_size';
SET @@transaction_alloc_block_size = 1024; SET @@transaction_alloc_block_size = 1024;
SET @@global.transaction_alloc_block_size = 134217728; SET @@global.transaction_alloc_block_size = 134217728;
SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size; SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
--echo '#---------------------FN_DYNVARS_001_09----------------------#' --echo '#---------------------FN_DYNVARS_001_09----------------------#'
######################################################################## ########################################################################

15
mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test
View File

@ -5,7 +5,7 @@
# Access Type: Dynamic # # Access Type: Dynamic #
# Data Type: numeric # # Data Type: numeric #
# Default Value: 4096 # # Default Value: 4096 #
# Range: 1024-134217728 # # Range: 1024-131072 #
# # # #
# # # #
# Creation Date: 2008-02-14 # # Creation Date: 2008-02-14 #
@ -79,7 +79,7 @@ SELECT @@global.transaction_prealloc_size;
################################################################### ###################################################################
# Change the value of variable to a valid value for SESSION Scope # # Change the value of variable to a valid value for SESSION Scope #
################################################################### ###################################################################
SET @@session.transaction_prealloc_size = 1024; SET @@session.transaction_prealloc_size = 1024;
SELECT @@session.transaction_prealloc_size; SELECT @@session.transaction_prealloc_size;
@ -148,8 +148,8 @@ SELECT @@session.transaction_prealloc_size;
#################################################################### ####################################################################
SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
WHERE VARIABLE_NAME='transaction_prealloc_size'; WHERE VARIABLE_NAME='transaction_prealloc_size';
--echo '#------------------FN_DYNVARS_005_07-----------------------#' --echo '#------------------FN_DYNVARS_005_07-----------------------#'
@ -157,8 +157,8 @@ WHERE VARIABLE_NAME='transaction_prealloc_size';
# Check if the value in SESSION Table matches value in variable # # Check if the value in SESSION Table matches value in variable #
#################################################################### ####################################################################
SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='transaction_prealloc_size'; WHERE VARIABLE_NAME='transaction_prealloc_size';
@ -173,7 +173,7 @@ SET @@global.transaction_prealloc_size = 1024;
SET @@global.transaction_prealloc_size = 10; SET @@global.transaction_prealloc_size = 10;
SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size; SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
--echo '#---------------------FN_DYNVARS_001_10----------------------#' --echo '#---------------------FN_DYNVARS_001_10----------------------#'
######################################################################## ########################################################################
@ -216,4 +216,3 @@ SELECT @@session.transaction_prealloc_size;
############################################################# #############################################################
# END OF transaction_prealloc_size TESTS # # END OF transaction_prealloc_size TESTS #
############################################################# #############################################################

5
mysql-test/t/variables-big.test
View File

@ -8,10 +8,9 @@
# Bug#27322 failure to allocate transaction_prealloc_size causes crash # Bug#27322 failure to allocate transaction_prealloc_size causes crash
# #
# #
# Manual (6.0): # Manual (5.1):
# Platform Bit Size Range Default # Platform Bit Size Range Default
# 32 1024-4294967295 (4 Gi - 1) 4096 # 32/64 1024-128k 4096
# 64 1024-18446744073709547520 4096
# #
# Observation(mleich): # Observation(mleich):
# 1. - Linux 64 Bit, MySQL 64 Bit, 4 GiB RAM, 8 GiB swap # 1. - Linux 64 Bit, MySQL 64 Bit, 4 GiB RAM, 8 GiB swap

4
sql/sys_vars.cc
View File

@ -1836,7 +1836,7 @@ static Sys_var_ulong Sys_trans_alloc_block_size(
"transaction_alloc_block_size", "transaction_alloc_block_size",
"Allocation block size for transactions to be stored in binary log", "Allocation block size for transactions to be stored in binary log",
SESSION_VAR(trans_alloc_block_size), CMD_LINE(REQUIRED_ARG), SESSION_VAR(trans_alloc_block_size), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(1024, 128 * 1024 * 1024), DEFAULT(QUERY_ALLOC_BLOCK_SIZE), VALID_RANGE(1024, 128 * 1024), DEFAULT(QUERY_ALLOC_BLOCK_SIZE),
BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_trans_mem_root)); ON_UPDATE(fix_trans_mem_root));
@ -1844,7 +1844,7 @@ static Sys_var_ulong Sys_trans_prealloc_size(
"transaction_prealloc_size", "transaction_prealloc_size",
"Persistent buffer for transactions to be stored in binary log", "Persistent buffer for transactions to be stored in binary log",
SESSION_VAR(trans_prealloc_size), CMD_LINE(REQUIRED_ARG), SESSION_VAR(trans_prealloc_size), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(1024, 128 * 1024 * 1024), DEFAULT(TRANS_ALLOC_PREALLOC_SIZE), VALID_RANGE(1024, 128 * 1024), DEFAULT(TRANS_ALLOC_PREALLOC_SIZE),
BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_trans_mem_root)); ON_UPDATE(fix_trans_mem_root));