Skip to content

M
mariadb
Commit f7a24d72 authored by Luis Soares's avatar Luis Soares
Browse files
Options

merge: 5.1 -> 5.1-rpl-merge 

conflicts:
  Text conflict in mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
  Text conflict in mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test
parents d41cae03 88a36a21
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 96 deletions
mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc
View file @ f7a24d72
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
############################################################################### ###############################################################################
SET @start_value = @@global.query_cache_size; SET @start_value = @@global.query_cache_size;
SELECT @start_value;
--echo '#--------------------FN_DYNVARS_133_01------------------------#' --echo '#--------------------FN_DYNVARS_133_01------------------------#'
############################################################################### ###############################################################################
...@@ -53,7 +52,7 @@ SELECT @@global.query_cache_size; ...@@ -53,7 +52,7 @@ SELECT @@global.query_cache_size;
############################################### ###############################################
SET @@global.query_cache_size = @start_value; SET @@global.query_cache_size = @start_value;
SELECT @@global.query_cache_size = 0; SELECT @@global.query_cache_size = @start_value;
--echo '#--------------------FN_DYNVARS_133_03------------------------#' --echo '#--------------------FN_DYNVARS_133_03------------------------#'
################################################################################ ################################################################################
...@@ -167,7 +166,6 @@ SELECT query_cache_size = @@session.query_cache_size; ...@@ -167,7 +166,6 @@ SELECT query_cache_size = @@session.query_cache_size;
############################## ##############################
SET @@global.query_cache_size = @start_value; SET @@global.query_cache_size = @start_value;
SELECT @@global.query_cache_size;
######################################################################## ########################################################################
# END OF query_cache_size TESTS # # END OF query_cache_size TESTS #
......
mysql-test/suite/sys_vars/inc/query_prealloc_size_basic.inc
View file @ f7a24d72
...@@ -74,8 +74,8 @@ SELECT @@session.query_prealloc_size = 8192; ...@@ -74,8 +74,8 @@ SELECT @@session.query_prealloc_size = 8192;
SET @@global.query_prealloc_size = 8192; SET @@global.query_prealloc_size = 8192;
SELECT @@global.query_prealloc_size ; SELECT @@global.query_prealloc_size ;
SET @@global.query_prealloc_size = 4294967295; #SET @@global.query_prealloc_size = 4294967295;
SELECT @@global.query_prealloc_size ; #SELECT @@global.query_prealloc_size ;
SET @@global.query_prealloc_size = 655354; SET @@global.query_prealloc_size = 655354;
SELECT @@global.query_prealloc_size ; SELECT @@global.query_prealloc_size ;
...@@ -89,8 +89,8 @@ SELECT @@global.query_prealloc_size ; ...@@ -89,8 +89,8 @@ SELECT @@global.query_prealloc_size ;
SET @@session.query_prealloc_size = 8192; SET @@session.query_prealloc_size = 8192;
SELECT @@session.query_prealloc_size ; SELECT @@session.query_prealloc_size ;
SET @@session.query_prealloc_size = 4294967295; #SET @@session.query_prealloc_size = 4294967295;
SELECT @@session.query_prealloc_size ; #SELECT @@session.query_prealloc_size ;
SET @@session.query_prealloc_size = 655345; SET @@session.query_prealloc_size = 655345;
SELECT @@session.query_prealloc_size ; SELECT @@session.query_prealloc_size ;
...@@ -106,11 +106,11 @@ SELECT @@session.query_prealloc_size ; ...@@ -106,11 +106,11 @@ SELECT @@session.query_prealloc_size ;
SET @@global.query_prealloc_size = 0; SET @@global.query_prealloc_size = 0;
SELECT @@global.query_prealloc_size ; SELECT @@global.query_prealloc_size ;
SET @@global.query_prealloc_size = -1024; #SET @@global.query_prealloc_size = -1024;
SELECT @@global.query_prealloc_size ; #SELECT @@global.query_prealloc_size ;
SET @@global.query_prealloc_size = 429496729533; #SET @@global.query_prealloc_size = 429496729533;
SELECT @@global.query_prealloc_size ; #SELECT @@global.query_prealloc_size ;
--Error ER_PARSE_ERROR --Error ER_PARSE_ERROR
...@@ -137,8 +137,8 @@ SELECT @@global.query_prealloc_size ; ...@@ -137,8 +137,8 @@ SELECT @@global.query_prealloc_size ;
SET @@session.query_prealloc_size = 0; SET @@session.query_prealloc_size = 0;
SELECT @@session.query_prealloc_size ; SELECT @@session.query_prealloc_size ;
SET @@session.query_prealloc_size = -2; #SET @@session.query_prealloc_size = -2;
SELECT @@session.query_prealloc_size ; #SELECT @@session.query_prealloc_size ;
--Error ER_PARSE_ERROR --Error ER_PARSE_ERROR
......
mysql-test/suite/sys_vars/inc/timestamp_basic.inc
View file @ f7a24d72
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
# * Scope & Access method # # * Scope & Access method #
# * Data Integrity # # * Data Integrity #
# # # #
# Reference: http://dev.mysql.com/doc/refman/5.1/en/ # # Reference: #
# server-system-variables.html # # http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html #
# # # #
############################################################################### ###############################################################################
...@@ -102,9 +102,10 @@ SET @@timestamp = 9999999999999999999999; ...@@ -102,9 +102,10 @@ SET @@timestamp = 9999999999999999999999;
# Check if the value in SESSION Table matches value in variable # # Check if the value in SESSION Table matches value in variable #
######################################################################### #########################################################################
SELECT @@timestamp = VARIABLE_VALUE # disabled due to bug#41584
FROM INFORMATION_SCHEMA.SESSION_VARIABLES #SELECT @@timestamp = VARIABLE_VALUE
WHERE VARIABLE_NAME='timestamp'; #FROM INFORMATION_SCHEMA.SESSION_VARIABLES
#WHERE VARIABLE_NAME='timestamp';
--echo '#---------------------FN_DYNVARS_001_08-------------------------#' --echo '#---------------------FN_DYNVARS_001_08-------------------------#'
############################################################################# #############################################################################
......
mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
View file @ f7a24d72
...@@ -42,6 +42,8 @@ SELECT @@global.join_buffer_size; ...@@ -42,6 +42,8 @@ SELECT @@global.join_buffer_size;
@@global.join_buffer_size @@global.join_buffer_size
65536 65536
SET @@global.join_buffer_size = 4294967295; SET @@global.join_buffer_size = 4294967295;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '4294967295'
SELECT @@global.join_buffer_size; SELECT @@global.join_buffer_size;
@@global.join_buffer_size @@global.join_buffer_size
4294963200 4294963200
...@@ -58,6 +60,8 @@ SELECT @@session.join_buffer_size; ...@@ -58,6 +60,8 @@ SELECT @@session.join_buffer_size;
@@session.join_buffer_size @@session.join_buffer_size
65536 65536
SET @@session.join_buffer_size = 4294967295; SET @@session.join_buffer_size = 4294967295;
Warnings:
Warning 1292 Truncated incorrect join_buffer_size value: '4294967295'
SELECT @@session.join_buffer_size; SELECT @@session.join_buffer_size;
@@session.join_buffer_size @@session.join_buffer_size
4294963200 4294963200
......
mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
View file @ f7a24d72
...@@ -71,7 +71,7 @@ SELECT @@session.log_warnings; ...@@ -71,7 +71,7 @@ SELECT @@session.log_warnings;
'#------------------FN_DYNVARS_067_05-----------------------#' '#------------------FN_DYNVARS_067_05-----------------------#'
SET @@global.log_warnings = 100000000000; SET @@global.log_warnings = 100000000000;
Warnings: Warnings:
Warning 1292 Truncated incorrect log-warnings value: '100000000000' Warning 1292 Truncated incorrect log_warnings value: '100000000000'
SELECT @@global.log_warnings; SELECT @@global.log_warnings;
@@global.log_warnings @@global.log_warnings
4294967295 4294967295
...@@ -91,7 +91,7 @@ SELECT @@global.log_warnings; ...@@ -91,7 +91,7 @@ SELECT @@global.log_warnings;
0 0
SET @@session.log_warnings = 100000000000; SET @@session.log_warnings = 100000000000;
Warnings: Warnings:
Warning 1292 Truncated incorrect log-warnings value: '100000000000' Warning 1292 Truncated incorrect log_warnings value: '100000000000'
SELECT @@session.log_warnings; SELECT @@session.log_warnings;
@@session.log_warnings @@session.log_warnings
4294967295 4294967295
......
mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic_32.result
View file @ f7a24d72
SET @start_value = @@global.max_binlog_cache_size; SET @start_value = @@global.max_binlog_cache_size;
SELECT @start_value; SELECT @start_value;
@start_value @start_value
4294967295 4294963200
'#--------------------FN_DYNVARS_072_01------------------------#' '#--------------------FN_DYNVARS_072_01------------------------#'
SET @@global.max_binlog_cache_size = 5000; SET @@global.max_binlog_cache_size = 5000;
SET @@global.max_binlog_cache_size = DEFAULT; SET @@global.max_binlog_cache_size = DEFAULT;
......
mysql-test/suite/sys_vars/r/myisam_max_sort_file_size_basic_32.result
View file @ f7a24d72
SET @start_global_value = @@global.myisam_max_sort_file_size; SET @start_global_value = @@global.myisam_max_sort_file_size;
SELECT @start_global_value; SELECT @start_global_value;
@start_global_value @start_global_value
2147483647 2146435072
'#--------------------FN_DYNVARS_094_01-------------------------#' '#--------------------FN_DYNVARS_094_01-------------------------#'
SET @@global.myisam_max_sort_file_size = 500000; SET @@global.myisam_max_sort_file_size = 500000;
SET @@global.myisam_max_sort_file_size = DEFAULT; SET @@global.myisam_max_sort_file_size = DEFAULT;
......
mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
View file @ f7a24d72
...@@ -36,10 +36,14 @@ SELECT @@global.query_alloc_block_size; ...@@ -36,10 +36,14 @@ SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size @@global.query_alloc_block_size
1024 1024
SET @@global.query_alloc_block_size = 4294967295; SET @@global.query_alloc_block_size = 4294967295;
Warnings:
Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967295'
SELECT @@global.query_alloc_block_size; SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size @@global.query_alloc_block_size
4294966272 4294966272
SET @@global.query_alloc_block_size = 4294967294; SET @@global.query_alloc_block_size = 4294967294;
Warnings:
Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967294'
SELECT @@global.query_alloc_block_size; SELECT @@global.query_alloc_block_size;
@@global.query_alloc_block_size @@global.query_alloc_block_size
4294966272 4294966272
...@@ -58,10 +62,14 @@ SELECT @@session.query_alloc_block_size; ...@@ -58,10 +62,14 @@ SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size @@session.query_alloc_block_size
1024 1024
SET @@session.query_alloc_block_size = 4294967295; SET @@session.query_alloc_block_size = 4294967295;
Warnings:
Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967295'
SELECT @@session.query_alloc_block_size; SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size @@session.query_alloc_block_size
4294966272 4294966272
SET @@session.query_alloc_block_size = 4294967294; SET @@session.query_alloc_block_size = 4294967294;
Warnings:
Warning 1292 Truncated incorrect query_alloc_block_size value: '4294967294'
SELECT @@session.query_alloc_block_size; SELECT @@session.query_alloc_block_size;
@@session.query_alloc_block_size @@session.query_alloc_block_size
4294966272 4294966272
......
mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
View file @ f7a24d72
SET @start_value = @@global.query_cache_size; SET @start_value = @@global.query_cache_size;
SELECT @start_value;
@start_value
0
'#--------------------FN_DYNVARS_133_01------------------------#' '#--------------------FN_DYNVARS_133_01------------------------#'
SET @@global.query_cache_size = 99; SET @@global.query_cache_size = 99;
SET @@global.query_cache_size = DEFAULT; SET @@global.query_cache_size = DEFAULT;
...@@ -10,8 +7,8 @@ SELECT @@global.query_cache_size; ...@@ -10,8 +7,8 @@ SELECT @@global.query_cache_size;
0 0
'#---------------------FN_DYNVARS_133_02-------------------------#' '#---------------------FN_DYNVARS_133_02-------------------------#'
SET @@global.query_cache_size = @start_value; SET @@global.query_cache_size = @start_value;
SELECT @@global.query_cache_size = 0; SELECT @@global.query_cache_size = @start_value;
@@global.query_cache_size = 0 @@global.query_cache_size = @start_value
1 1
'#--------------------FN_DYNVARS_133_03------------------------#' '#--------------------FN_DYNVARS_133_03------------------------#'
SET @@global.query_cache_size = 0; SET @@global.query_cache_size = 0;
...@@ -133,6 +130,3 @@ ERROR 42S02: Unknown table 'global' in field list ...@@ -133,6 +130,3 @@ ERROR 42S02: Unknown table 'global' in field list
SELECT query_cache_size = @@session.query_cache_size; SELECT query_cache_size = @@session.query_cache_size;
ERROR 42S22: Unknown column 'query_cache_size' in 'field list' ERROR 42S22: Unknown column 'query_cache_size' in 'field list'
SET @@global.query_cache_size = @start_value; SET @@global.query_cache_size = @start_value;
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result
View file @ f7a24d72
SET @start_value = @@global.query_cache_size; SET @start_value = @@global.query_cache_size;
SELECT @start_value;
@start_value
0
'#--------------------FN_DYNVARS_133_01------------------------#' '#--------------------FN_DYNVARS_133_01------------------------#'
SET @@global.query_cache_size = 99; SET @@global.query_cache_size = 99;
SET @@global.query_cache_size = DEFAULT; SET @@global.query_cache_size = DEFAULT;
...@@ -10,8 +7,8 @@ SELECT @@global.query_cache_size; ...@@ -10,8 +7,8 @@ SELECT @@global.query_cache_size;
0 0
'#---------------------FN_DYNVARS_133_02-------------------------#' '#---------------------FN_DYNVARS_133_02-------------------------#'
SET @@global.query_cache_size = @start_value; SET @@global.query_cache_size = @start_value;
SELECT @@global.query_cache_size = 0; SELECT @@global.query_cache_size = @start_value;
@@global.query_cache_size = 0 @@global.query_cache_size = @start_value
1 1
'#--------------------FN_DYNVARS_133_03------------------------#' '#--------------------FN_DYNVARS_133_03------------------------#'
SET @@global.query_cache_size = 0; SET @@global.query_cache_size = 0;
...@@ -129,6 +126,3 @@ ERROR 42S02: Unknown table 'global' in field list ...@@ -129,6 +126,3 @@ ERROR 42S02: Unknown table 'global' in field list
SELECT query_cache_size = @@session.query_cache_size; SELECT query_cache_size = @@session.query_cache_size;
ERROR 42S22: Unknown column 'query_cache_size' in 'field list' ERROR 42S22: Unknown column 'query_cache_size' in 'field list'
SET @@global.query_cache_size = @start_value; SET @@global.query_cache_size = @start_value;
SELECT @@global.query_cache_size;
@@global.query_cache_size
0
mysql-test/suite/sys_vars/r/query_prealloc_size_basic_32.result
View file @ f7a24d72
...@@ -35,10 +35,6 @@ SET @@global.query_prealloc_size = 8192; ...@@ -35,10 +35,6 @@ SET @@global.query_prealloc_size = 8192;
SELECT @@global.query_prealloc_size ; SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size @@global.query_prealloc_size
8192 8192
SET @@global.query_prealloc_size = 4294967295;
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
4294966272
SET @@global.query_prealloc_size = 655354; SET @@global.query_prealloc_size = 655354;
SELECT @@global.query_prealloc_size ; SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size @@global.query_prealloc_size
...@@ -48,10 +44,6 @@ SET @@session.query_prealloc_size = 8192; ...@@ -48,10 +44,6 @@ SET @@session.query_prealloc_size = 8192;
SELECT @@session.query_prealloc_size ; SELECT @@session.query_prealloc_size ;
@@session.query_prealloc_size @@session.query_prealloc_size
8192 8192
SET @@session.query_prealloc_size = 4294967295;
SELECT @@session.query_prealloc_size ;
@@session.query_prealloc_size
4294966272
SET @@session.query_prealloc_size = 655345; SET @@session.query_prealloc_size = 655345;
SELECT @@session.query_prealloc_size ; SELECT @@session.query_prealloc_size ;
@@session.query_prealloc_size @@session.query_prealloc_size
...@@ -63,50 +55,32 @@ Warning 1292 Truncated incorrect query_prealloc_size value: '0' ...@@ -63,50 +55,32 @@ Warning 1292 Truncated incorrect query_prealloc_size value: '0'
SELECT @@global.query_prealloc_size ; SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size @@global.query_prealloc_size
8192 8192
SET @@global.query_prealloc_size = -1024;
Warnings:
Warning 1292 Truncated incorrect query_prealloc_size value: '0'
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
8192
SET @@global.query_prealloc_size = 429496729533;
Warnings:
Warning 1292 Truncated incorrect query_prealloc_size value: '429496729533'
SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size
4294966272
SET @@global.query_prealloc_size = 65530.34.; SET @@global.query_prealloc_size = 65530.34.;
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '.' at line 1
SELECT @@global.query_prealloc_size ; SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size @@global.query_prealloc_size
4294966272 8192
SET @@global.query_prealloc_size = test; SET @@global.query_prealloc_size = test;
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size' ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
SELECT @@global.query_prealloc_size ; SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size @@global.query_prealloc_size
4294966272 8192
SET @@global.query_prealloc_size = "test"; SET @@global.query_prealloc_size = "test";
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size' ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
SELECT @@global.query_prealloc_size ; SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size @@global.query_prealloc_size
4294966272 8192
SET @@global.query_prealloc_size = 'test'; SET @@global.query_prealloc_size = 'test';
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size' ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
SELECT @@global.query_prealloc_size ; SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size @@global.query_prealloc_size
4294966272 8192
SET @@global.query_prealloc_size = ON; SET @@global.query_prealloc_size = ON;
ERROR 42000: Incorrect argument type to variable 'query_prealloc_size' ERROR 42000: Incorrect argument type to variable 'query_prealloc_size'
SELECT @@global.query_prealloc_size ; SELECT @@global.query_prealloc_size ;
@@global.query_prealloc_size @@global.query_prealloc_size
4294966272
SET @@session.query_prealloc_size = 0;
Warnings:
Warning 1292 Truncated incorrect query_prealloc_size value: '0'
SELECT @@session.query_prealloc_size ;
@@session.query_prealloc_size
8192 8192
SET @@session.query_prealloc_size = -2; SET @@session.query_prealloc_size = 0;
Warnings: Warnings:
Warning 1292 Truncated incorrect query_prealloc_size value: '0' Warning 1292 Truncated incorrect query_prealloc_size value: '0'
SELECT @@session.query_prealloc_size ; SELECT @@session.query_prealloc_size ;
......
mysql-test/suite/sys_vars/r/range_alloc_block_size_basic_32.result
View file @ f7a24d72
...@@ -39,10 +39,14 @@ SELECT @@global.range_alloc_block_size; ...@@ -39,10 +39,14 @@ SELECT @@global.range_alloc_block_size;
4096 4096
'Bug# 34877: Invalid Values are coming in variable on assigning valid values'; 'Bug# 34877: Invalid Values are coming in variable on assigning valid values';
SET @@global.range_alloc_block_size = 4294967295; SET @@global.range_alloc_block_size = 4294967295;
Warnings:
Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967295'
SELECT @@global.range_alloc_block_size; SELECT @@global.range_alloc_block_size;
@@global.range_alloc_block_size @@global.range_alloc_block_size
4294966272 4294966272
SET @@global.range_alloc_block_size = 4294967294; SET @@global.range_alloc_block_size = 4294967294;
Warnings:
Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967294'
SELECT @@global.range_alloc_block_size; SELECT @@global.range_alloc_block_size;
@@global.range_alloc_block_size @@global.range_alloc_block_size
4294966272 4294966272
...@@ -55,10 +59,14 @@ SELECT @@session.range_alloc_block_size; ...@@ -55,10 +59,14 @@ SELECT @@session.range_alloc_block_size;
@@session.range_alloc_block_size @@session.range_alloc_block_size
4096 4096
SET @@session.range_alloc_block_size = 4294967295; SET @@session.range_alloc_block_size = 4294967295;
Warnings:
Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967295'
SELECT @@session.range_alloc_block_size; SELECT @@session.range_alloc_block_size;
@@session.range_alloc_block_size @@session.range_alloc_block_size
4294966272 4294966272
SET @@session.range_alloc_block_size = 4294967294; SET @@session.range_alloc_block_size = 4294967294;
Warnings:
Warning 1292 Truncated incorrect range_alloc_block_size value: '4294967294'
SELECT @@session.range_alloc_block_size; SELECT @@session.range_alloc_block_size;
@@session.range_alloc_block_size @@session.range_alloc_block_size
4294966272 4294966272
......
mysql-test/suite/sys_vars/r/timestamp_basic_32.result
View file @ f7a24d72
...@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to variable 'timestamp' ...@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to variable 'timestamp'
SET @@timestamp = 9999999999999999999999; SET @@timestamp = 9999999999999999999999;
ERROR 42000: Incorrect argument type to variable 'timestamp' ERROR 42000: Incorrect argument type to variable 'timestamp'
'#----------------------FN_DYNVARS_001_06------------------------#' '#----------------------FN_DYNVARS_001_06------------------------#'
SELECT @@timestamp = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='timestamp';
@@timestamp = VARIABLE_VALUE
1
'#---------------------FN_DYNVARS_001_08-------------------------#' '#---------------------FN_DYNVARS_001_08-------------------------#'
SET @@timestamp = OFF; SET @@timestamp = OFF;
ERROR 42000: Incorrect argument type to variable 'timestamp' ERROR 42000: Incorrect argument type to variable 'timestamp'
......
mysql-test/suite/sys_vars/r/timestamp_basic_64.result
View file @ f7a24d72
...@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to variable 'timestamp' ...@@ -35,11 +35,6 @@ ERROR 42000: Incorrect argument type to variable 'timestamp'
SET @@timestamp = 9999999999999999999999; SET @@timestamp = 9999999999999999999999;
ERROR 42000: Incorrect argument type to variable 'timestamp' ERROR 42000: Incorrect argument type to variable 'timestamp'
'#----------------------FN_DYNVARS_001_06------------------------#' '#----------------------FN_DYNVARS_001_06------------------------#'
SELECT @@timestamp = VARIABLE_VALUE
FROM INFORMATION_SCHEMA.SESSION_VARIABLES
WHERE VARIABLE_NAME='timestamp';
@@timestamp = VARIABLE_VALUE
1
'#---------------------FN_DYNVARS_001_08-------------------------#' '#---------------------FN_DYNVARS_001_08-------------------------#'
SET @@timestamp = OFF; SET @@timestamp = OFF;
ERROR 42000: Incorrect argument type to variable 'timestamp' ERROR 42000: Incorrect argument type to variable 'timestamp'
......
mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
View file @ f7a24d72
...@@ -40,6 +40,8 @@ SELECT @@global.transaction_alloc_block_size; ...@@ -40,6 +40,8 @@ SELECT @@global.transaction_alloc_block_size;
@@global.transaction_alloc_block_size @@global.transaction_alloc_block_size
59392 59392
SET @@global.transaction_alloc_block_size = 4294967295; SET @@global.transaction_alloc_block_size = 4294967295;
Warnings:
Warning 1292 Truncated incorrect transaction_alloc_block_size value: '4294967295'
SELECT @@global.transaction_alloc_block_size; SELECT @@global.transaction_alloc_block_size;
@@global.transaction_alloc_block_size @@global.transaction_alloc_block_size
4294966272 4294966272
...@@ -50,6 +52,8 @@ SELECT @@session.transaction_alloc_block_size; ...@@ -50,6 +52,8 @@ SELECT @@session.transaction_alloc_block_size;
@@session.transaction_alloc_block_size @@session.transaction_alloc_block_size
1024 1024
SET @@session.transaction_alloc_block_size =4294967295; SET @@session.transaction_alloc_block_size =4294967295;
Warnings:
Warning 1292 Truncated incorrect transaction_alloc_block_size value: '4294967295'
SELECT @@session.transaction_alloc_block_size; SELECT @@session.transaction_alloc_block_size;
@@session.transaction_alloc_block_size @@session.transaction_alloc_block_size
4294966272 4294966272
...@@ -146,6 +150,8 @@ WHERE VARIABLE_NAME='transaction_alloc_block_size'; ...@@ -146,6 +150,8 @@ WHERE VARIABLE_NAME='transaction_alloc_block_size';
'#---------------------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 = 4294967295; SET @@global.transaction_alloc_block_size = 4294967295;
Warnings:
Warning 1292 Truncated incorrect transaction_alloc_block_size value: '4294967295'
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
......
mysql-test/t/character_set_client_basic.test → mysql-test/suite/sys_vars/t/character_set_client_basic.test
View file @ f7a24d72
...@@ -207,7 +207,7 @@ SELECT @@character_set_client; ...@@ -207,7 +207,7 @@ SELECT @@character_set_client;
let charset_variable = @@global.character_set_client; let charset_variable = @@global.character_set_client;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_010_08-------------------------#' --echo '#--------------------FN_DYNVARS_010_08-------------------------#'
################################################################################ ################################################################################
......
mysql-test/t/character_set_connection_basic.test → mysql-test/suite/sys_vars/t/character_set_connection_basic.test
View file @ f7a24d72
...@@ -122,7 +122,7 @@ SET @@character_set_connection = utf8 + latin2; ...@@ -122,7 +122,7 @@ SET @@character_set_connection = utf8 + latin2;
############################################################################## ##############################################################################
let charset_variable = @@session.character_set_connection; let charset_variable = @@session.character_set_connection;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_011_07-------------------------#' --echo '#--------------------FN_DYNVARS_011_07-------------------------#'
...@@ -131,7 +131,7 @@ let charset_variable = @@session.character_set_connection; ...@@ -131,7 +131,7 @@ let charset_variable = @@session.character_set_connection;
############################################################################## ##############################################################################
let charset_variable = @@global.character_set_connection; let charset_variable = @@global.character_set_connection;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_011_08-------------------------#' --echo '#--------------------FN_DYNVARS_011_08-------------------------#'
......
mysql-test/t/character_set_database_basic.test → mysql-test/suite/sys_vars/t/character_set_database_basic.test
View file @ f7a24d72
...@@ -121,7 +121,7 @@ SET @@character_set_database = utf8 + latin2; ...@@ -121,7 +121,7 @@ SET @@character_set_database = utf8 + latin2;
############################################################################# #############################################################################
let charset_variable = @@session.character_set_database; let charset_variable = @@session.character_set_database;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_012_07-------------------------#' --echo '#--------------------FN_DYNVARS_012_07-------------------------#'
...@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_database; ...@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_database;
############################################################################## ##############################################################################
let charset_variable = @@global.character_set_database; let charset_variable = @@global.character_set_database;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_012_08-------------------------#' --echo '#--------------------FN_DYNVARS_012_08-------------------------#'
......
mysql-test/t/character_set_filesystem_basic.test → mysql-test/suite/sys_vars/t/character_set_filesystem_basic.test
View file @ f7a24d72
...@@ -121,7 +121,7 @@ SET @@character_set_filesystem = utf8 + latin2; ...@@ -121,7 +121,7 @@ SET @@character_set_filesystem = utf8 + latin2;
############################################################################### ###############################################################################
let charset_variable = @@session.character_set_filesystem; let charset_variable = @@session.character_set_filesystem;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_008_07-------------------------#' --echo '#--------------------FN_DYNVARS_008_07-------------------------#'
...@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_filesystem; ...@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_filesystem;
############################################################################## ##############################################################################
let charset_variable = @@global.character_set_filesystem; let charset_variable = @@global.character_set_filesystem;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_008_08-------------------------#' --echo '#--------------------FN_DYNVARS_008_08-------------------------#'
......
mysql-test/t/character_set_results_basic.test → mysql-test/suite/sys_vars/t/character_set_results_basic.test
View file @ f7a24d72
...@@ -121,7 +121,7 @@ SET @@character_set_results = utf8 + latin2; ...@@ -121,7 +121,7 @@ SET @@character_set_results = utf8 + latin2;
############################################################################## ##############################################################################
let charset_variable = @@session.character_set_results; let charset_variable = @@session.character_set_results;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_013_07-------------------------#' --echo '#--------------------FN_DYNVARS_013_07-------------------------#'
...@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_results; ...@@ -130,7 +130,7 @@ let charset_variable = @@session.character_set_results;
############################################################################### ###############################################################################
let charset_variable = @@global.character_set_results; let charset_variable = @@global.character_set_results;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_013_08-------------------------#' --echo '#--------------------FN_DYNVARS_013_08-------------------------#'
......
mysql-test/t/character_set_server_basic.test → mysql-test/suite/sys_vars/t/character_set_server_basic.test
View file @ f7a24d72
...@@ -123,7 +123,7 @@ SET @@character_set_server = utf8 + latin2; ...@@ -123,7 +123,7 @@ SET @@character_set_server = utf8 + latin2;
let charset_variable = @@session.character_set_server; let charset_variable = @@session.character_set_server;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_009_07-------------------------#' --echo '#--------------------FN_DYNVARS_009_07-------------------------#'
...@@ -132,7 +132,7 @@ let charset_variable = @@session.character_set_server; ...@@ -132,7 +132,7 @@ let charset_variable = @@session.character_set_server;
############################################################################### ###############################################################################
let charset_variable = @@global.character_set_server; let charset_variable = @@global.character_set_server;
--source include/charset_basic.inc --source suite/sys_vars/inc/charset_basic.inc
--echo '#--------------------FN_DYNVARS_009_08-------------------------#' --echo '#--------------------FN_DYNVARS_009_08-------------------------#'
......
mysql-test/t/collation_connection_basic.test → mysql-test/suite/sys_vars/t/collation_connection_basic.test
View file @ f7a24d72
...@@ -122,7 +122,7 @@ SET @@collation_connection = latin7_general_ci + latin7_general_cs; ...@@ -122,7 +122,7 @@ SET @@collation_connection = latin7_general_ci + latin7_general_cs;
############################################################################### ###############################################################################
let collation_variable = @@session.collation_connection; let collation_variable = @@session.collation_connection;
--source include/collation_basic.inc --source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_015_07-------------------------#' --echo '#--------------------FN_DYNVARS_015_07-------------------------#'
...@@ -131,7 +131,7 @@ let collation_variable = @@session.collation_connection; ...@@ -131,7 +131,7 @@ let collation_variable = @@session.collation_connection;
############################################################################### ###############################################################################
let collation_variable = @@global.collation_connection; let collation_variable = @@global.collation_connection;
--source include/collation_basic.inc --source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_015_08-------------------------#' --echo '#--------------------FN_DYNVARS_015_08-------------------------#'
......
mysql-test/t/collation_database_basic.test → mysql-test/suite/sys_vars/t/collation_database_basic.test
View file @ f7a24d72
...@@ -121,7 +121,7 @@ SET @@collation_database = latin7_general_ci + latin7_general_cs; ...@@ -121,7 +121,7 @@ SET @@collation_database = latin7_general_ci + latin7_general_cs;
########################################################################### ###########################################################################
let collation_variable = @@session.collation_database; let collation_variable = @@session.collation_database;
--source include/collation_basic.inc --source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_016_07-------------------------#' --echo '#--------------------FN_DYNVARS_016_07-------------------------#'
...@@ -130,7 +130,7 @@ let collation_variable = @@session.collation_database; ...@@ -130,7 +130,7 @@ let collation_variable = @@session.collation_database;
############################################################################### ###############################################################################
let collation_variable = @@global.collation_database; let collation_variable = @@global.collation_database;
--source include/collation_basic.inc --source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_016_08-------------------------#' --echo '#--------------------FN_DYNVARS_016_08-------------------------#'
......
mysql-test/t/collation_server_basic.test → mysql-test/suite/sys_vars/t/collation_server_basic.test
View file @ f7a24d72
...@@ -121,7 +121,7 @@ SET @@collation_server = latin7_general_ci + latin7_general_cs; ...@@ -121,7 +121,7 @@ SET @@collation_server = latin7_general_ci + latin7_general_cs;
############################################################################## ##############################################################################
let collation_variable = @@session.collation_server; let collation_variable = @@session.collation_server;
--source include/collation_basic.inc --source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_014_07-------------------------#' --echo '#--------------------FN_DYNVARS_014_07-------------------------#'
...@@ -130,7 +130,7 @@ let collation_variable = @@session.collation_server; ...@@ -130,7 +130,7 @@ let collation_variable = @@session.collation_server;
############################################################################# #############################################################################
let collation_variable = @@global.collation_server; let collation_variable = @@global.collation_server;
--source include/collation_basic.inc --source suite/sys_vars/inc/collation_basic.inc
--echo '#--------------------FN_DYNVARS_014_08-------------------------#' --echo '#--------------------FN_DYNVARS_014_08-------------------------#'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7