mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
5.5-merge
This commit is contained in:
@@ -772,7 +772,7 @@ SET @@myisam_mmap_size= 500M;
|
||||
--echo # Bug #52315: utc_date() crashes when system time > year 2037
|
||||
--echo #
|
||||
|
||||
--error 0, ER_UNKNOWN_ERROR
|
||||
--error 0, ER_WRONG_VALUE_FOR_VAR
|
||||
SET TIMESTAMP=2*1024*1024*1024;
|
||||
--echo #Should not crash
|
||||
--disable_result_log
|
||||
@@ -1235,6 +1235,69 @@ SET GLOBAL max_binlog_cache_size = @old_max_binlog_cache_size;
|
||||
SELECT @@skip_name_resolve;
|
||||
SHOW VARIABLES LIKE 'skip_name_resolve';
|
||||
|
||||
--echo #
|
||||
--echo # Bug #43233 : Some server variables are clipped during "update,"
|
||||
--echo # not "check" stage
|
||||
--echo #
|
||||
|
||||
SET @kbs=@@global.key_buffer_size;
|
||||
SET @kcbs=@@global.key_cache_block_size;
|
||||
|
||||
--echo throw errors in STRICT mode
|
||||
SET SQL_MODE=STRICT_ALL_TABLES;
|
||||
|
||||
# sys_var_ulonglong_ptr: sys_max_binlog_cache_size
|
||||
--error ER_WRONG_VALUE_FOR_VAR
|
||||
SET @@global.max_binlog_cache_size=-1;
|
||||
|
||||
# sys_var_thd_ha_rows: "max_join_size" et al.
|
||||
--error ER_WRONG_VALUE_FOR_VAR
|
||||
SET @@global.max_join_size=0;
|
||||
|
||||
# sys_var_key_buffer_size: "key_buffer_size"
|
||||
--error ER_WARN_CANT_DROP_DEFAULT_KEYCACHE
|
||||
SET @@global.key_buffer_size=0;
|
||||
|
||||
# sys_var_key_cache_long: "key_cache_block_size" et al.
|
||||
--error ER_WRONG_VALUE_FOR_VAR
|
||||
SET @@global.key_cache_block_size=0;
|
||||
|
||||
--echo throw warnings in default mode
|
||||
SET SQL_MODE=DEFAULT;
|
||||
|
||||
SET @@global.max_binlog_cache_size=-1;
|
||||
SET @@global.max_join_size=0;
|
||||
# this is an exception. since this is a new error/warning, let's stay
|
||||
# compatible with the upcoming 5.6.
|
||||
--error ER_WARN_CANT_DROP_DEFAULT_KEYCACHE
|
||||
SET @@global.key_buffer_size=0;
|
||||
SET @@global.key_cache_block_size=0;
|
||||
|
||||
#
|
||||
# Bug#56976: added new start-up parameter
|
||||
#
|
||||
select @@max_long_data_size;
|
||||
|
||||
--echo #
|
||||
--echo # Bug#11766424 59527: DECIMAL_BIN_SIZE: ASSERTION `SCALE >= 0 && PRECISION > 0 && SCALE <= PRE
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1(f1 DECIMAL(1,1) UNSIGNED);
|
||||
INSERT INTO t1 VALUES (0.2),(0.1);
|
||||
SELECT 1 FROM t1 GROUP BY @a:= (SELECT ROUND(f1) FROM t1 WHERE @a=f1);
|
||||
DROP TABLE t1;
|
||||
|
||||
CREATE TABLE t1 AS SELECT @a:= CAST(1 AS UNSIGNED) AS a;
|
||||
SHOW CREATE TABLE t1;
|
||||
DROP TABLE t1;
|
||||
|
||||
# cleanup
|
||||
SET @@global.max_binlog_cache_size=DEFAULT;
|
||||
SET @@global.max_join_size=DEFAULT;
|
||||
SET @@global.key_buffer_size=@kbs;
|
||||
SET @@global.key_cache_block_size=@kcbs;
|
||||
|
||||
|
||||
--echo End of 5.1 tests
|
||||
|
||||
###########################################################################
|
||||
@@ -1426,3 +1489,29 @@ drop function t1_max;
|
||||
|
||||
|
||||
###########################################################################
|
||||
|
||||
|
||||
--echo #
|
||||
--echo # Bug #59884: setting charset to 2048 crashes
|
||||
--echo #
|
||||
|
||||
--error ER_UNKNOWN_CHARACTER_SET
|
||||
set session character_set_results = 2048;
|
||||
--error ER_UNKNOWN_CHARACTER_SET
|
||||
set session character_set_client=2048;
|
||||
--error ER_UNKNOWN_CHARACTER_SET
|
||||
set session character_set_connection=2048;
|
||||
--error ER_UNKNOWN_CHARACTER_SET
|
||||
set session character_set_server=2048;
|
||||
--error ER_UNKNOWN_COLLATION
|
||||
set session collation_server=2048;
|
||||
--error ER_UNKNOWN_CHARACTER_SET
|
||||
set session character_set_filesystem=2048;
|
||||
--error ER_UNKNOWN_CHARACTER_SET
|
||||
set session character_set_database=2048;
|
||||
--error ER_UNKNOWN_COLLATION
|
||||
set session collation_connection=2048;
|
||||
--error ER_UNKNOWN_COLLATION
|
||||
set session collation_database=2048;
|
||||
|
||||
--echo End of 5.5 tests
|
||||
|
||||
Reference in New Issue
Block a user