mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Support for variables with components
Added framework to create/drop and manager buffers for multiple key caches include/my_getopt.h: Fixed prototype include/my_sys.h: Added (temporary) KEY_CACHE type include/mysqld_error.h: New error messages mysql-test/r/select_safe.result: Updated test results mysql-test/r/variables.result: Updated test results mysys/my_getopt.c: Fixed bugs with GET_ASK_ADDR sql/Makefile.am: Make sql_yacc.o depend on all header files in sql directory sql/item_func.cc: Added support for variable components sql/mysql_priv.h: Added support for variable components sql/mysqld.cc: Added support for multiple key caches sql/set_var.cc: Added support for multiple key caches sql/set_var.h: Added support for multiple key caches sql/share/czech/errmsg.txt: New error messages sql/share/danish/errmsg.txt: New error messages sql/share/dutch/errmsg.txt: New error messages sql/share/english/errmsg.txt: New error messages sql/share/estonian/errmsg.txt: New error messages sql/share/french/errmsg.txt: New error messages sql/share/german/errmsg.txt: New error messages sql/share/greek/errmsg.txt: New error messages sql/share/hungarian/errmsg.txt: New error messages sql/share/italian/errmsg.txt: New error messages sql/share/japanese/errmsg.txt: New error messages sql/share/korean/errmsg.txt: New error messages sql/share/norwegian-ny/errmsg.txt: New error messages sql/share/norwegian/errmsg.txt: New error messages sql/share/polish/errmsg.txt: New error messages sql/share/portuguese/errmsg.txt: New error messages sql/share/romanian/errmsg.txt: New error messages sql/share/russian/errmsg.txt: New error messages sql/share/serbian/errmsg.txt: New error messages sql/share/slovak/errmsg.txt: New error messages sql/share/spanish/errmsg.txt: New error messages sql/share/swedish/errmsg.txt: New error messages sql/share/ukrainian/errmsg.txt: New error messages sql/sql_lex.cc: Fixes for quoting of variables. sql/sql_parse.cc: Fix after changing prototype for get_system_var sql/sql_show.cc: Fix after introducing variable components sql/sql_yacc.yy: Support for variables with components (To support multiple key caches)
This commit is contained in:
43
mysql-test/r/key_cache.result
Normal file
43
mysql-test/r/key_cache.result
Normal file
@ -0,0 +1,43 @@
|
||||
SET @save_key_buffer=@@key_buffer_size;
|
||||
SELECT @@key_buffer_size, @@small.key_buffer_size;
|
||||
@@key_buffer_size @@small.key_buffer_size
|
||||
2097152 131072
|
||||
SET @@global.key_buffer_size=16*1024*1024;
|
||||
SET @@global.default.key_buffer_size=16*1024*1024;
|
||||
SET @@global.default.key_buffer_size=16*1024*1024;
|
||||
SET @@global.small.key_buffer_size=1*1024*1024;
|
||||
SET @@global.medium.key_buffer_size=4*1024*1024;
|
||||
SET @@global.medium.key_buffer_size=0;
|
||||
SET @@global.medium.key_buffer_size=0;
|
||||
SHOW VARIABLES like "key_buffer_size";
|
||||
Variable_name Value
|
||||
key_buffer_size 16777216
|
||||
SELECT @@key_buffer_size;
|
||||
@@key_buffer_size
|
||||
16777216
|
||||
SELECT @@global.key_buffer_size;
|
||||
@@global.key_buffer_size
|
||||
16777216
|
||||
SELECT @@global.default.key_buffer_size;
|
||||
@@global.default.key_buffer_size
|
||||
16777216
|
||||
SELECT @@global.default.`key_buffer_size`;
|
||||
@@global.default.key_buffer_size
|
||||
16777216
|
||||
SELECT @@global.`default`.`key_buffer_size`;
|
||||
@@global.default.key_buffer_size
|
||||
16777216
|
||||
SELECT @@`default`.key_buffer_size;
|
||||
@@default.key_buffer_size
|
||||
16777216
|
||||
SELECT @@small.key_buffer_size;
|
||||
@@small.key_buffer_size
|
||||
1048576
|
||||
SELECT @@medium.key_buffer_size;
|
||||
@@medium.key_buffer_size
|
||||
4194304
|
||||
SET @@global.key_buffer_size=@save_key_buffer;
|
||||
SELECT @@default.key_buffer_size;
|
||||
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 'default.key_buffer_size' at line 1
|
||||
SELECT @@skr.table_type="test";
|
||||
ERROR HY000: Variable 'table_type' is not a variable component (Can't be used as XXXX.variable_name)
|
@ -37,7 +37,7 @@ delete from t1 where b="test" limit 1;
|
||||
delete from t1 where a+0=1 limit 2;
|
||||
SET MAX_JOIN_SIZE=2;
|
||||
SELECT @@MAX_JOIN_SIZE, @@SQL_BIG_SELECTS;
|
||||
@@max_join_size @@sql_big_selects
|
||||
@@MAX_JOIN_SIZE @@SQL_BIG_SELECTS
|
||||
2 0
|
||||
insert into t1 values (null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a");
|
||||
SELECT * from t1;
|
||||
|
@ -77,7 +77,7 @@ select last_insert_id(345);
|
||||
last_insert_id(345)
|
||||
345
|
||||
select @@IDENTITY,last_insert_id(), @@identity;
|
||||
@@identity last_insert_id() @@identity
|
||||
@@IDENTITY last_insert_id() @@identity
|
||||
345 345 345
|
||||
set big_tables=OFF, big_tables=ON, big_tables=0, big_tables=1, big_tables="OFF", big_tables="ON";
|
||||
set global concurrent_insert=ON;
|
||||
|
1
mysql-test/t/key_cache-master.opt
Normal file
1
mysql-test/t/key_cache-master.opt
Normal file
@ -0,0 +1 @@
|
||||
--key_buffer_size=2M --small.key_buffer_size=256K --small.key_buffer_size=128K
|
42
mysql-test/t/key_cache.test
Normal file
42
mysql-test/t/key_cache.test
Normal file
@ -0,0 +1,42 @@
|
||||
#
|
||||
# Test of key cache
|
||||
#
|
||||
|
||||
SET @save_key_buffer=@@key_buffer_size;
|
||||
|
||||
SELECT @@key_buffer_size, @@small.key_buffer_size;
|
||||
|
||||
# Change default key cache size
|
||||
SET @@global.key_buffer_size=16*1024*1024;
|
||||
SET @@global.default.key_buffer_size=16*1024*1024;
|
||||
SET @@global.default.key_buffer_size=16*1024*1024;
|
||||
|
||||
SET @@global.small.key_buffer_size=1*1024*1024;
|
||||
SET @@global.medium.key_buffer_size=4*1024*1024;
|
||||
# Drop buffer
|
||||
SET @@global.medium.key_buffer_size=0;
|
||||
# Test double drop
|
||||
SET @@global.medium.key_buffer_size=0;
|
||||
|
||||
# Print key buffer with different syntaxes
|
||||
SHOW VARIABLES like "key_buffer_size";
|
||||
SELECT @@key_buffer_size;
|
||||
SELECT @@global.key_buffer_size;
|
||||
SELECT @@global.default.key_buffer_size;
|
||||
SELECT @@global.default.`key_buffer_size`;
|
||||
SELECT @@global.`default`.`key_buffer_size`;
|
||||
SELECT @@`default`.key_buffer_size;
|
||||
|
||||
SELECT @@small.key_buffer_size;
|
||||
SELECT @@medium.key_buffer_size;
|
||||
|
||||
SET @@global.key_buffer_size=@save_key_buffer;
|
||||
|
||||
#
|
||||
# Errors
|
||||
#
|
||||
|
||||
--error 1064
|
||||
SELECT @@default.key_buffer_size;
|
||||
--error 1270
|
||||
SELECT @@skr.table_type="test";
|
Reference in New Issue
Block a user