database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Assorted post-merge fixes, clean-up, integration, compat with 5.6.

Browse Source 
43233/55794.
This commit is contained in:
Tatiana A. Nurnberg
2010-11-25 03:11:05 +00:00
parent 9ab7421b10
commit 3a15cb6ce9
9 changed files with 15 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1275,7 +1275,7 @@ SET @@global.max_binlog_cache_size=-1;
SET @@global.max_join_size=0;
# sys_var_key_buffer_size: "key_buffer_size"
--error ER_WRONG_VALUE_FOR_VAR
--error ER_WARN_CANT_DROP_DEFAULT_KEYCACHE
SET @@global.key_buffer_size=0;
# sys_var_key_cache_long: "key_cache_block_size" et al.
@@ -1287,6 +1287,9 @@ 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;