mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed compiler warnings

Browse source 
Made stopping of slave more robust
Fixed tokudb test cases that gave different results between runs
Speed up some slow tokudb tests by adding begin ... commit


mysql-test/extra/rpl_tests/rpl_stop_slave.test:
  Ensure that slaves are properly synced before they are stopped.
  (Otherwise some tests results will be different between runs)
storage/innobase/buf/buf0buf.cc:
  Fixed compiler warning
storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_and_int_hidden.result:
  Test case could be solved with index or range scan.
storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test:
  Test case could be solved with index or range scan.
storage/tokudb/mysql-test/tokudb_bugs/r/5733_innodb.result:
  Speed up test by adding begin...commit
storage/tokudb/mysql-test/tokudb_bugs/r/5733_tokudb.result:
  Speed up test by adding begin...commit
storage/tokudb/mysql-test/tokudb_bugs/t/5733_innodb.test:
  Speed up test by adding begin...commit
storage/tokudb/mysql-test/tokudb_bugs/t/5733_tokudb.test:
  Speed up test by adding begin...commit
storage/tokudb/mysql-test/tokudb_mariadb/r/compression.result:
  Added drop table (safety)
storage/tokudb/mysql-test/tokudb_mariadb/t/compression.test:
  Added drop table (safety)
This commit is contained in:
Michael Widenius 2014-01-29 15:41:10 +02:00
commit 2410ecac60
10 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/extra/rpl_tests/rpl_stop_slave.test
View file

@ -59,3 +59,6 @@ source include/wait_for_slave_sql_to_stop.inc;
connection slave;
START SLAVE SQL_THREAD;
source include/wait_for_slave_sql_to_start.inc;
connection master;
sync_slave_with_master;

2
storage/innobase/buf/buf0buf.cc
View file

@ -2436,7 +2436,7 @@ buf_page_get_gen(
ibool must_read;
rw_lock_t* hash_lock;
ib_mutex_t* block_mutex;
buf_page_t* hash_bpage;
buf_page_t* hash_bpage __attribute__((unused));
ulint retries = 0;
buf_pool_t* buf_pool = buf_pool_get(space, offset);

4
storage/tokudb/mysql-test/tokudb/r/cluster_filter_unpack_varchar_and_int_hidden.result
View file

@ -182,14 +182,14 @@ a b c d e f
3 30 200 2000 20000 200000
explain select * from t1 where b > 0;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index b b NULL NULL NULL; Using where; Using index
1 SIMPLE t1 index_or_range b b NULL NULL NULL; Using where; Using index_or_range
select * from t1 where b > 0;
a b c d e f
2 20 100 1000 10000 100000
3 30 200 2000 20000 200000
explain select * from t1 where d > "0";
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 index d d NULL NULL NULL; Using where; Using index
1 SIMPLE t1 index_or_range d d NULL NULL NULL; Using where; Using index_or_range
select * from t1 where d > "0";
a b c d e f
2 20 100 1000 10000 100000

2
storage/tokudb/mysql-test/tokudb/t/cluster_filter_unpack_varchar_and_int_hidden.test
View file

@ -83,10 +83,12 @@ explain select * from t1;
select * from t1;
--replace_column 7 NULL 9 NULL;
--replace_result index index_or_range range index_or_range
explain select * from t1 where b > 0;
select * from t1 where b > 0;
--replace_column 7 NULL 9 NULL;
--replace_result index index_or_range range index_or_range
explain select * from t1 where d > "0";
select * from t1 where d > "0";

2
storage/tokudb/mysql-test/tokudb_bugs/r/5733_innodb.result
View file

@ -1,6 +1,7 @@
drop table if exists t;
set default_storage_engine='innodb';
create table t (id bigint primary key, x bigint not null);
begin;
insert into t values (0,0);
insert into t values (1,0);
insert into t values (2,0);
@ -10001,6 +10002,7 @@ insert into t values (9996,0);
insert into t values (9997,0);
insert into t values (9998,0);
insert into t values (9999,0);
commit;
explain select id from t where id>0 limit 10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t range PRIMARY PRIMARY 8 NULL # Using where; Using index

4
storage/tokudb/mysql-test/tokudb_bugs/r/5733_tokudb.result
View file

@ -1,6 +1,7 @@
drop table if exists t;
set default_storage_engine='tokudb';
create table t (id bigint primary key, x bigint not null);
begin;
insert into t values (0,0);
insert into t values (1,0);
insert into t values (2,0);
@ -10001,9 +10002,10 @@ insert into t values (9996,0);
insert into t values (9997,0);
insert into t values (9998,0);
insert into t values (9999,0);
commit;
explain select id from t where id>0 limit 10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t range PRIMARY PRIMARY 8 NULL # Using where; Using index
1 SIMPLE t index_or_range PRIMARY PRIMARY 8 NULL # Using where; Using index_or_range
explain select * from t where id>0 limit 10;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t range PRIMARY PRIMARY 8 NULL # Using where

2
storage/tokudb/mysql-test/tokudb_bugs/t/5733_innodb.test
View file

@ -11,12 +11,14 @@ set default_storage_engine='innodb';
create table t (id bigint primary key, x bigint not null);
begin;
let $i=0;
let $n=10000;
while ($i < $n) {
eval insert into t values ($i,0);
inc $i;
}
commit;
replace_column 9 #;
explain select id from t where id>0 limit 10;

4
storage/tokudb/mysql-test/tokudb_bugs/t/5733_tokudb.test
View file

@ -11,14 +11,18 @@ set default_storage_engine='tokudb';
create table t (id bigint primary key, x bigint not null);
begin;
let $i=0;
let $n=10000;
while ($i < $n) {
eval insert into t values ($i,0);
inc $i;
}
commit;
# TokuDB may do index or range scan on this. Both are ok
replace_column 9 #;
--replace_result index index_or_range range index_or_range
explain select id from t where id>0 limit 10;
replace_column 9 #;

1
storage/tokudb/mysql-test/tokudb_mariadb/r/compression.result
View file

@ -1,3 +1,4 @@
drop table if exists t1,t2,t3,t4,t5,t6;
create table t1 (a text) engine=tokudb compression=tokudb_uncompressed;
create table t2 (a text) engine=tokudb compression=tokudb_zlib;
create table t3 (a text) engine=tokudb compression=tokudb_quicklz;

7
storage/tokudb/mysql-test/tokudb_mariadb/t/compression.test
View file

@ -1,3 +1,10 @@
#
# Initial cleanup from previous tests
#
--disable_warnings
drop table if exists t1,t2,t3,t4,t5,t6;
--enable_warnings
create table t1 (a text) engine=tokudb compression=tokudb_uncompressed;
create table t2 (a text) engine=tokudb compression=tokudb_zlib;
create table t3 (a text) engine=tokudb compression=tokudb_quicklz;