mirror of
https://github.com/MariaDB/server.git
synced 2025-11-08 00:28:29 +03:00
BUILD/SETUP.sh: Update from 5.1 include/maria.h: Moved structs into size order mysql-test/include/varchar.inc: Fixed error numbers (as in 5.1) mysql-test/mysql-test-run.pl: Updated from 5.1 Create a dummy mysql.err file if using --valgrind --debug mysql-test/lib/init_db.sql: Update from 5.1 mysql-test/lib/mtr_cases.pl: Update from 5.1 mysql-test/lib/mtr_diff.pl: Update from 5.1 mysql-test/lib/mtr_gcov.pl: Update from 5.1 mysql-test/lib/mtr_gprof.pl: Update from 5.1 mysql-test/lib/mtr_im.pl: Update from 5.1 mysql-test/lib/mtr_io.pl: Update from 5.1 mysql-test/lib/mtr_match.pl: Update from 5.1 mysql-test/lib/mtr_misc.pl: Update from 5.1 mysql-test/lib/mtr_process.pl: Update from 5.1 mysql-test/lib/mtr_report.pl: Update from 5.1 mysql-test/lib/mtr_stress.pl: Update from 5.1 mysql-test/lib/mtr_timer.pl: Update from 5.1 mysql-test/lib/mtr_unique.pl: Update from 5.1 mysql-test/r/maria.result: Updated results. The reason for the new results are: - Maria doesn't support REPAIR TABLE or OPTIMIZE table yet - Some statistics information is different, so MySQL prefers index reads instead of table scans - No support for concurrent writes in the default BLOCK_RECORD mode - No support for different KEY_BLOCK sizes (will not be fixed) mysql-test/t/disabled.def: Enable maria test mysql-test/t/maria.test: No support for concurrent writes in the default BLOCK_RECORD mode No support for different KEY_BLOCK sizes (will not be fixed) mysql-test/t/myisam.test: Fix to be able to run with --extern mysql-test/t/query_cache_notembedded.test: Fix to be able to run with --extern sql/filesort.cc: Fixed compiler warning sql/handler.cc: Use new error message (as in 5.1) sql/share/errmsg.txt: Update error messages (as in 5.1) sql/slave.cc: Fixed compiler warning sql/slave.h: Fixed compiler warning sql/sql_table.cc: Fixed compiler warning storage/maria/ha_maria.cc: Added better scan_time() Disble REPAIR on BLOCK_RECORD tables Added rnd_end() to free memory after scan Don't pack numerical primary keys Don't allow fast alter table if row type changes storage/maria/ha_maria.h: Added get_row_type(), scan_time() and rnd_end() BitKeeper/etc/ignore: Added storage/maria/unittest/mf_pagecache_consist_1k-t-big storage/maria/unittest/mf_pagecache_consist_1kHC-t-big storage/maria/unittest/mf_pagecache_consist_1kRD-t-big storage/maria/unittest/mf_pagecache_consist_1kWR-t-big storage/maria/unittest/mf_pagecache_consist_64k-t-big storage/maria/unittest/mf_pagecache_consist_64kHC-t-big storage/maria/unittest/mf_pagecache_consist_64kRD-t-big storage/maria/unittest/mf_pagecache_consist_64kWR-t-big storage/maria/unittest/mf_pagecache_single_64k-t-big to the ignore list storage/maria/ma_bitmap.c: Fixed some bugs found with maria.test Added more DBUG_PRINT and some more comments storage/maria/ma_blockrec.c: Fixed some bugs found with maria.test Simplified code More comments storage/maria/ma_blockrec.h: Added DBUG_ASSERT() storage/maria/ma_check.c: Don't check record data links with block_records Update state.changed properly storage/maria/ma_checksum.c: Fixed bug in checksum handling (only first field was calculated) storage/maria/ma_create.c: Set rec->fill_length properly Added extra testing needed for BLOCK_RECORD Fixed bug in unlock of not locked mutex Fixed memory leak storage/maria/ma_delete.c: Update state.changed storage/maria/ma_delete_all.c: Update state.changed storage/maria/ma_extra.c: Disable caching of rows if we are using BLOCK_RECORD (scan_init will enable caching of rows when using BLOCK_RECORD) storage/maria/ma_info.c: Added data_file_type storage/maria/ma_search.c: Fixed bug with signed bytes storage/maria/ma_test2.c: Fixed wrong pointer handling (caused crash on 64 bit machines) storage/maria/ma_write.c: Added DBUG_ statements storage/maria/maria_def.h: Added STATE_NOT_OPTIMIZED_ROWS storage/myisam/mi_create.c: Fixed bug with unlocking of not locked mutex (in case of error condition) storage/myisam/mi_test2.c: Fixed wrong pointer handling (caused crash on 64 bit machines)
228 lines
5.5 KiB
Plaintext
228 lines
5.5 KiB
Plaintext
-- source include/have_query_cache.inc
|
|
-- source include/not_embedded.inc
|
|
|
|
#
|
|
# Tests with query cache
|
|
#
|
|
set GLOBAL query_cache_size=1355776;
|
|
|
|
# Reset query cache variables.
|
|
|
|
flush query cache; # This crashed in some versions
|
|
flush query cache; # This crashed in some versions
|
|
reset query cache;
|
|
flush status;
|
|
--disable_warnings
|
|
drop table if exists t1, t2, t3, t11, t21;
|
|
--enable_warnings
|
|
#
|
|
# FLUSH QUERY CACHE
|
|
#
|
|
create table t1 (a int not null);
|
|
insert into t1 values (1),(2),(3);
|
|
create table t2 (a int not null);
|
|
insert into t2 values (1),(2),(3);
|
|
select * from t1;
|
|
select * from t2;
|
|
insert into t1 values (4);
|
|
show status like "Qcache_free_blocks";
|
|
flush query cache;
|
|
show status like "Qcache_free_blocks";
|
|
drop table t1, t2;
|
|
# With join results...
|
|
create table t1 (a text not null);
|
|
create table t11 (a text not null);
|
|
create table t2 (a text not null);
|
|
create table t21 (a text not null);
|
|
create table t3 (a text not null);
|
|
insert into t1 values("1111111111111111111111111111111111111111111111111111");
|
|
insert into t2 select * from t1;
|
|
insert into t1 select * from t2;
|
|
insert into t2 select * from t1;
|
|
insert into t1 select * from t2;
|
|
insert into t2 select * from t1;
|
|
insert into t1 select * from t2;
|
|
insert into t2 select * from t1;
|
|
insert into t1 select * from t2;
|
|
insert into t2 select * from t1;
|
|
insert into t1 select * from t2;
|
|
insert into t2 select * from t1;
|
|
insert into t1 select * from t2;
|
|
insert into t2 select * from t1;
|
|
insert into t1 select * from t2;
|
|
insert into t2 select * from t1;
|
|
# t11 and t21 must be over 4Kb (QUERY_CACHE_MIN_RESULT_DATA_SIZE)
|
|
insert into t11 select * from t1;
|
|
insert into t21 select * from t1;
|
|
insert into t1 select * from t2;
|
|
insert into t2 select * from t1;
|
|
insert into t1 select * from t2;
|
|
#results of t3 must be > 0.5Mb
|
|
insert into t3 select * from t1;
|
|
insert into t3 select * from t2;
|
|
insert into t3 select * from t1;
|
|
disable_result_log;
|
|
select * from t11;
|
|
select * from t21;
|
|
enable_result_log;
|
|
show status like "Qcache_total_blocks";
|
|
show status like "Qcache_free_blocks";
|
|
disable_result_log;
|
|
insert into t11 values("");
|
|
select * from t3;
|
|
enable_result_log;
|
|
show status like "Qcache_total_blocks";
|
|
show status like "Qcache_free_blocks";
|
|
flush query cache;
|
|
show status like "Qcache_total_blocks";
|
|
show status like "Qcache_free_blocks";
|
|
drop table t1, t2, t3, t11, t21;
|
|
|
|
#
|
|
# do not use QC if tables locked (BUG#12385)
|
|
#
|
|
connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
|
|
connection root;
|
|
CREATE TABLE t1 ( a INT NOT NULL PRIMARY KEY AUTO_INCREMENT ) ENGINE =
|
|
MyISAM;
|
|
LOCK TABLE t1 READ LOCAL;
|
|
connect (root2,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
|
|
connection root2;
|
|
INSERT INTO t1 VALUES (), (), ();
|
|
connection root;
|
|
SELECT * FROM t1;
|
|
connection root2;
|
|
SELECT * FROM t1;
|
|
connection root;
|
|
SELECT * FROM t1;
|
|
drop table t1;
|
|
|
|
#
|
|
# query in QC from normal execution and SP (BUG#6897)
|
|
# improved to also test BUG#3583 and BUG#12990
|
|
#
|
|
flush query cache;
|
|
reset query cache;
|
|
flush status;
|
|
delimiter //;
|
|
create table t1 (s1 int)//
|
|
create procedure f1 () begin
|
|
select sql_cache * from t1;
|
|
select sql_cache * from t1;
|
|
select sql_cache * from t1;
|
|
end;//
|
|
create procedure f2 () begin
|
|
select sql_cache * from t1 where s1=1;
|
|
select sql_cache * from t1;
|
|
end;//
|
|
create procedure f3 () begin
|
|
select sql_cache * from t1;
|
|
select sql_cache * from t1 where s1=1;
|
|
end;//
|
|
create procedure f4 () begin
|
|
select sql_cache * from t1;
|
|
select sql_cache * from t1 where s1=1;
|
|
select sql_cache * from t1;
|
|
select sql_cache * from t1 where s1=1;
|
|
select sql_cache * from t1 where s1=1;
|
|
end;//
|
|
delimiter ;//
|
|
call f1();
|
|
--replace_result 1 3
|
|
show status like "Qcache_queries_in_cache";
|
|
show status like "Qcache_inserts";
|
|
show status like "Qcache_hits";
|
|
call f1();
|
|
show status like "Qcache_queries_in_cache";
|
|
show status like "Qcache_inserts";
|
|
show status like "Qcache_hits";
|
|
call f1();
|
|
select sql_cache * from t1;
|
|
show status like "Qcache_queries_in_cache";
|
|
show status like "Qcache_inserts";
|
|
show status like "Qcache_hits";
|
|
insert into t1 values (1);
|
|
select sql_cache * from t1;
|
|
show status like "Qcache_queries_in_cache";
|
|
show status like "Qcache_inserts";
|
|
show status like "Qcache_hits";
|
|
call f1();
|
|
call f1();
|
|
select sql_cache * from t1;
|
|
show status like "Qcache_queries_in_cache";
|
|
show status like "Qcache_inserts";
|
|
show status like "Qcache_hits";
|
|
flush query cache;
|
|
reset query cache;
|
|
flush status;
|
|
select sql_cache * from t1;
|
|
select sql_cache * from t1 where s1=1;
|
|
call f1();
|
|
call f2();
|
|
call f3();
|
|
call f4();
|
|
call f4();
|
|
call f3();
|
|
call f2();
|
|
select sql_cache * from t1 where s1=1;
|
|
insert into t1 values (2);
|
|
call f1();
|
|
select sql_cache * from t1 where s1=1;
|
|
select sql_cache * from t1;
|
|
call f1();
|
|
call f3();
|
|
call f3();
|
|
call f1();
|
|
|
|
drop procedure f1;
|
|
drop procedure f2;
|
|
drop procedure f3;
|
|
drop procedure f4;
|
|
drop table t1;
|
|
|
|
#
|
|
# bug#14767: INSERT in SF + concurrent SELECT with query cache
|
|
#
|
|
SET GLOBAL log_bin_trust_function_creators = 1;
|
|
|
|
reset query cache;
|
|
--disable_warnings
|
|
drop function if exists f1;
|
|
--enable_warnings
|
|
create table t1 (id int);
|
|
delimiter |;
|
|
create function f1 ()
|
|
returns int
|
|
begin
|
|
declare i_var int;
|
|
set i_var = sleep(3);
|
|
insert into t1 values(3);
|
|
set i_var = sleep(3);
|
|
return 0;
|
|
end;|
|
|
delimiter ;|
|
|
|
|
connect (con1,localhost,root,,);
|
|
connect (con2,localhost,root,,);
|
|
|
|
connection con1;
|
|
send select f1();
|
|
connection con2;
|
|
select sleep(4);
|
|
select * from t1;
|
|
connection con1;
|
|
reap;
|
|
connection con2;
|
|
# This gives wrong result i.e. 't' table seems to be empty
|
|
select * from t1;
|
|
reset query cache;
|
|
select * from t1;
|
|
drop table t1;
|
|
drop function f1;
|
|
disconnect con1;
|
|
disconnect con2;
|
|
connection default;
|
|
|
|
set GLOBAL query_cache_size=0;
|
|
SET GLOBAL log_bin_trust_function_creators = 0;
|