diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-22 17:06:50 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-22 17:06:50 +0100 |
| commit | ffa8c4cfcc41d4f160e3bdfca5cfd4b01a7d6e63 (patch) | |
| tree | 728585c36f22a5db3cea796430883d0ebc5c05eb /mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_basic.result | |
| parent | e27c34f9e4ca15c797fcd3191ee5679c2f237a09 (diff) | |
| parent | 52c26f7a1f675185d2ef1a28aca7f9bcc67c6414 (diff) | |
| download | mariadb-git-ffa8c4cfcc41d4f160e3bdfca5cfd4b01a7d6e63.tar.gz | |
Percona-Server-5.6.14-rel62.0 merge
support ha_innodb.so as a dynamic plugin.
* remove obsolete *,innodb_plugin.rdiff files
* s/--plugin-load=/--plugin-load-add=/
* MYSQL_PLUGIN_IMPORT glob_hostname[]
* use my_error instead of push_warning_printf(ER_DEFAULT)
* don't use tdc_size and tc_size in a module
update test cases (XtraDB is 5.6.14, InnoDB is 5.6.10)
* copy new tests over
* disable some tests for (old) InnoDB
* delete XtraDB tests that no longer apply
small compatibility changes:
* s/HTON_EXTENDED_KEYS/HTON_SUPPORTS_EXTENDED_KEYS/
* revert unnecessary InnoDB changes to make it a bit closer to the upstream
fix XtraDB to compile on Windows (both as a static and a dynamic plugin)
disable XtraDB on Windows (deadlocks) and where no atomic ops are available (e.g. CentOS 5)
storage/innobase/handler/ha_innodb.cc:
revert few unnecessary changes to make it a bit closer to the original InnoDB
storage/innobase/include/univ.i:
correct the version to match what it was merged from
Diffstat (limited to 'mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_basic.result')
| -rw-r--r-- | mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_basic.result | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_basic.result b/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_basic.result new file mode 100644 index 00000000000..0aefabd48f7 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/innodb_ft_result_cache_limit_basic.result @@ -0,0 +1,32 @@ +select @@global.innodb_ft_result_cache_limit; +@@global.innodb_ft_result_cache_limit +2000000000 +select @@session.innodb_ft_result_cache_limit; +ERROR HY000: Variable 'innodb_ft_result_cache_limit' is a GLOBAL variable +show global variables like 'innodb_ft_result_cache_limit'; +Variable_name Value +innodb_ft_result_cache_limit 2000000000 +show session variables like 'innodb_ft_result_cache_limit'; +Variable_name Value +innodb_ft_result_cache_limit 2000000000 +select * from information_schema.global_variables where variable_name='innodb_ft_result_cache_limit'; +VARIABLE_NAME VARIABLE_VALUE +INNODB_FT_RESULT_CACHE_LIMIT 2000000000 +select * from information_schema.session_variables where variable_name='innodb_ft_result_cache_limit'; +VARIABLE_NAME VARIABLE_VALUE +INNODB_FT_RESULT_CACHE_LIMIT 2000000000 +set global innodb_ft_result_cache_limit=900000; +Warnings: +Warning 1292 Truncated incorrect innodb_ft_result_cache_limit value: '900000' +select @@innodb_ft_result_cache_limit; +@@innodb_ft_result_cache_limit +1000000 +set global innodb_ft_result_cache_limit=1000000; +select @@innodb_ft_result_cache_limit; +@@innodb_ft_result_cache_limit +1000000 +set global innodb_ft_result_cache_limit=4000000000; +select @@innodb_ft_result_cache_limit; +@@innodb_ft_result_cache_limit +4000000000 +set global innodb_ft_result_cache_limit=2000000000; |