diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2010-11-25 03:50:16 +0000 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2010-11-25 03:50:16 +0000 |
| commit | c24ec469862efd232a7e4868092ff4a4b631ac62 (patch) | |
| tree | c4dd23f6b4dc06870068ee555a2510dfca2b43a1 /mysql-test/r/variables.result | |
| parent | 7bf81b15c61ac9c81c5cb59629aeba9ffe97006e (diff) | |
| parent | 7336ac45b77bb8f794de3c37d6aa4864c02c6c57 (diff) | |
| download | mariadb-git-c24ec469862efd232a7e4868092ff4a4b631ac62.tar.gz | |
merge some docs changes and a test case; null merge the code.
(we don't need to port the actual code from 5.1;
5.5+ do the relevant things differently, but correctly. the
test obviously is so it stays that way.)
mysql-test/r/variables.result:
add test case.
mysql-test/t/variables.test:
add test case.
strings/CHARSET_INFO.txt:
clarify documentation
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index be81afe1a43..ee180169916 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -1511,6 +1511,39 @@ SELECT @@skip_name_resolve; SHOW VARIABLES LIKE 'skip_name_resolve'; Variable_name Value skip_name_resolve OFF +# +# Bug #43233 : Some server variables are clipped during "update," +# not "check" stage +# +SET @kbs=@@global.key_buffer_size; +SET @kcbs=@@global.key_cache_block_size; +throw errors in STRICT mode +SET SQL_MODE=STRICT_ALL_TABLES; +SET @@global.max_binlog_cache_size=-1; +ERROR 42000: Variable 'max_binlog_cache_size' can't be set to the value of '-1' +SET @@global.max_join_size=0; +ERROR 42000: Variable 'max_join_size' can't be set to the value of '0' +SET @@global.key_buffer_size=0; +ERROR HY000: Cannot drop default keycache +SET @@global.key_cache_block_size=0; +ERROR 42000: Variable 'key_cache_block_size' can't be set to the value of '0' +throw warnings in default mode +SET SQL_MODE=DEFAULT; +SET @@global.max_binlog_cache_size=-1; +Warnings: +Warning 1292 Truncated incorrect max_binlog_cache_size value: '-1' +SET @@global.max_join_size=0; +Warnings: +Warning 1292 Truncated incorrect max_join_size value: '0' +SET @@global.key_buffer_size=0; +ERROR HY000: Cannot drop default keycache +SET @@global.key_cache_block_size=0; +Warnings: +Warning 1292 Truncated incorrect key_cache_block_size value: '0' +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; End of 5.1 tests # |