mirror of
https://github.com/MariaDB/server.git
synced 2025-05-28 13:01:41 +03:00
33efc9677d
Fixed (together with Guilhem) bugs in mysqlbinlog regarding --offset Prefix addresses with 0x for easier comparisons of debug logs Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index This fix changed some 'index' queries to 'range' queries in the test suite Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause. This fix removed of a lot of 'Using where' notes in the test suite. Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS Give NOTE instead of WARNING for safe field-type conversions Makefile.am: Don't automaticly update files from bk client/mysqlbinlog.cc: Merge with 4.1 (+ apply bug fixes for --offset and --start-position) include/my_sys.h: Faster clear_alloc_root() mysql-test/r/bdb.result: Updated results after merge mysql-test/r/create.result: Updated results after merge mysql-test/r/func_group.result: Updated results after merge mysql-test/r/func_if.result: Updated results after merge mysql-test/r/heap_btree.result: Updated results after merge mysql-test/r/index_merge.result: Updated results after merge mysql-test/r/index_merge_ror.result: Updated results after merge mysql-test/r/innodb.result: Updated results after merge mysql-test/r/join_outer.result: Updated results after merge mysql-test/r/mysqlbinlog2.result: Updated results after merge mysql-test/r/negation_elimination.result: Updated results after merge mysql-test/r/null.result: Updated results after merge Added more tests mysql-test/r/null_key.result: Updated results after merge Added more tests mysql-test/r/order_by.result: Updated results after merge mysql-test/r/range.result: Updated results after merge Added more tests mysql-test/r/rpl_charset.result: Updated results after merge mysql-test/r/sp-error.result: Updated results after merge mysql-test/r/sp.result: Updated results after merge Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle mysql-test/r/type_blob.result: Updated results after merge (Some warnings are now notes) mysql-test/r/user_var.result: Updated results after merge Added more tests mysql-test/r/variables.result: Updated results after merge mysql-test/r/view.result: Updated results after merge mysql-test/t/mysqlbinlog2.test: Updated tests to use new positions mysql-test/t/null.test: More tests mysql-test/t/null_key.test: More tests mysql-test/t/range.test: More tests mysql-test/t/rpl_charset.test: Avoid big diffs in the future if tests changes mysql-test/t/sp-error.test: Updated error numbers mysql-test/t/sp-security.test: Updated error numbers mysql-test/t/sp.test: Updated results after merge Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle mysql-test/t/user_var.test: More tests mysql-test/t/view.test: Updated error numbers mysys/my_alloc.c: Write into debug log the address of the allocated area sql/ha_isam.cc: Prefix addresses with 0x for easier comparisons of debug logs sql/ha_myisam.cc: Prefix addresses with 0x for easier comparisons of debug logs sql/ha_ndbcluster.cc: Add missing enum to switch sql/handler.cc: remove compiler warning sql/item.cc: More debugging Simple cleanup sql/item.h: Move Item::cleanup() to item.cc sql/item_cmpfunc.cc: Fix arena code sql/item_subselect.cc: After merge fixes sql/item_subselect.h: After merge fixes sql/item_sum.cc: Updated comment sql/log_event.cc: Remove wrong test sql/mysql_priv.h: Indentation fixes sql/mysqld.cc: After merge fixes Added 0x to pointers in debug log sql/opt_range.cc: Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index This fix changed some 'index' queries to 'range' queries in the test suite sql/set_var.cc: Indentation fixes sql/sp_head.cc: Set state to INITIALIZED to make SP work with new arena code sql/sql_base.cc: After merge fixes sql/sql_class.cc: More debugging Use clear_alloc_root() instead of init_alloc_root() as the former is faster sql/sql_class.h: New method 'only_prepare()' sql/sql_lex.cc: After merge fixes sql/sql_lex.h: After merge fixes sql/sql_parse.cc: Fix for timezone tables. (The old way to add timezone tables to global list in 'create_total_list' doesn't work anymore) Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS sql/sql_prepare.cc: After merge fixes sql/sql_select.cc: Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause. This fix removed of a lot of 'Using where' notes in the test suite sql/sql_table.cc: Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS sql/sql_union.cc: After merge fix sql/sql_view.cc: After merge fix sql/table.cc: After merge fix sql/tztime.cc: Update timezone table handling to use new table lists structure sql/tztime.h: Update timezone table handling to use new table lists structure sql/unireg.cc: Use 0x before pointers
372 lines
13 KiB
Plaintext
372 lines
13 KiB
Plaintext
drop table if exists t1,t2;
|
|
create table t1 (a int, b int not null,unique key (a,b),index(b)) engine=myisam;
|
|
insert ignore into t1 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(null,7),(9,9),(8,8),(7,7),(null,9),(null,9),(6,6);
|
|
explain select * from t1 where a is null;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref a a 5 const 3 Using where; Using index
|
|
explain select * from t1 where a is null and b = 2;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref a,b a 9 const,const 1 Using where; Using index
|
|
explain select * from t1 where a is null and b = 7;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref a,b a 9 const,const 1 Using where; Using index
|
|
explain select * from t1 where a=2 and b = 2;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 const a,b a 9 const,const 1 Using index
|
|
explain select * from t1 where a<=>b limit 2;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 index NULL a 9 NULL 12 Using where; Using index
|
|
explain select * from t1 where (a is null or a > 0 and a < 3) and b < 5 limit 3;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 range a,b a 9 NULL 3 Using where; Using index
|
|
explain select * from t1 where (a is null or a = 7) and b=7;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref_or_null a,b a 9 const,const 2 Using where; Using index
|
|
explain select * from t1 where (a is null or a = 7) and b=7 order by a;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref_or_null a,b a 9 const,const 2 Using where; Using index; Using filesort
|
|
explain select * from t1 where (a is null and b>a) or a is null and b=7 limit 2;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref a,b a 5 const 3 Using where; Using index
|
|
explain select * from t1 where a is null and b=9 or a is null and b=7 limit 3;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref a,b a 5 const 2 Using where; Using index
|
|
explain select * from t1 where a > 1 and a < 3 limit 1;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 range a a 5 NULL 1 Using where; Using index
|
|
explain select * from t1 where a > 8 and a < 9;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 range a a 5 NULL 1 Using where; Using index
|
|
select * from t1 where a is null;
|
|
a b
|
|
NULL 7
|
|
NULL 9
|
|
NULL 9
|
|
select * from t1 where a is null and b = 7;
|
|
a b
|
|
NULL 7
|
|
select * from t1 where a<=>b limit 2;
|
|
a b
|
|
1 1
|
|
2 2
|
|
select * from t1 where (a is null or a > 0 and a < 3) and b < 5 limit 3;
|
|
a b
|
|
1 1
|
|
2 2
|
|
select * from t1 where (a is null or a > 0 and a < 3) and b > 7 limit 3;
|
|
a b
|
|
NULL 9
|
|
NULL 9
|
|
select * from t1 where (a is null or a = 7) and b=7;
|
|
a b
|
|
7 7
|
|
NULL 7
|
|
select * from t1 where a is null and b=9 or a is null and b=7 limit 3;
|
|
a b
|
|
NULL 7
|
|
NULL 9
|
|
NULL 9
|
|
select * from t1 where a > 1 and a < 3 limit 1;
|
|
a b
|
|
2 2
|
|
select * from t1 where a > 8 and a < 9;
|
|
a b
|
|
create table t2 like t1;
|
|
insert into t2 select * from t1;
|
|
alter table t1 modify b blob not null, add c int not null, drop key a, add unique key (a,b(20),c), drop key b, add key (b(10));
|
|
explain select * from t1 where a is null and b = 2;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref a,b a 5 const 3 Using where
|
|
explain select * from t1 where a is null and b = 2 and c=0;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref a,b a 5 const 3 Using where
|
|
explain select * from t1 where a is null and b = 7 and c=0;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref a,b a 5 const 3 Using where
|
|
explain select * from t1 where a=2 and b = 2;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref a,b a 5 const 1 Using where
|
|
explain select * from t1 where a<=>b limit 2;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ALL NULL NULL NULL NULL 12 Using where
|
|
explain select * from t1 where (a is null or a > 0 and a < 3) and b < 5 and c=0 limit 3;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 range a,b a 5 NULL 5 Using where
|
|
explain select * from t1 where (a is null or a = 7) and b=7 and c=0;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref_or_null a,b a 5 const 4 Using where
|
|
explain select * from t1 where (a is null and b>a) or a is null and b=7 limit 2;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref a,b a 5 const 3 Using where
|
|
explain select * from t1 where a is null and b=9 or a is null and b=7 limit 3;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref a,b a 5 const 3 Using where
|
|
explain select * from t1 where a > 1 and a < 3 limit 1;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 range a a 5 NULL 1 Using where
|
|
explain select * from t1 where a is null and b=7 or a > 1 and a < 3 limit 1;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 range a,b a 5 NULL 4 Using where
|
|
explain select * from t1 where a > 8 and a < 9;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 range a a 5 NULL 1 Using where
|
|
explain select * from t1 where b like "6%";
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 range b b 12 NULL 1 Using where
|
|
select * from t1 where a is null;
|
|
a b c
|
|
NULL 7 0
|
|
NULL 9 0
|
|
NULL 9 0
|
|
select * from t1 where a is null and b = 7 and c=0;
|
|
a b c
|
|
NULL 7 0
|
|
select * from t1 where a<=>b limit 2;
|
|
a b c
|
|
1 1 0
|
|
2 2 0
|
|
select * from t1 where (a is null or a > 0 and a < 3) and b < 5 limit 3;
|
|
a b c
|
|
1 1 0
|
|
2 2 0
|
|
select * from t1 where (a is null or a > 0 and a < 3) and b > 7 limit 3;
|
|
a b c
|
|
NULL 9 0
|
|
NULL 9 0
|
|
select * from t1 where (a is null or a = 7) and b=7 and c=0;
|
|
a b c
|
|
7 7 0
|
|
NULL 7 0
|
|
select * from t1 where a is null and b=9 or a is null and b=7 limit 3;
|
|
a b c
|
|
NULL 7 0
|
|
NULL 9 0
|
|
NULL 9 0
|
|
select * from t1 where b like "6%";
|
|
a b c
|
|
6 6 0
|
|
drop table t1;
|
|
rename table t2 to t1;
|
|
alter table t1 modify b int null;
|
|
insert into t1 values (7,null), (8,null), (8,7);
|
|
explain select * from t1 where a = 7 and (b=7 or b is null);
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref_or_null a,b a 10 const,const 2 Using where; Using index
|
|
select * from t1 where a = 7 and (b=7 or b is null);
|
|
a b
|
|
7 7
|
|
7 NULL
|
|
explain select * from t1 where (a = 7 or a is null) and (b=7 or b is null);
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref_or_null a,b a 5 const 4 Using where; Using index
|
|
select * from t1 where (a = 7 or a is null) and (b=7 or b is null);
|
|
a b
|
|
7 NULL
|
|
7 7
|
|
NULL 7
|
|
explain select * from t1 where (a = 7 or a is null) and (a = 7 or a is null);
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref_or_null a a 5 const 5 Using where; Using index
|
|
select * from t1 where (a = 7 or a is null) and (a = 7 or a is null);
|
|
a b
|
|
7 NULL
|
|
7 7
|
|
NULL 7
|
|
NULL 9
|
|
NULL 9
|
|
create table t2 (a int);
|
|
insert into t2 values (7),(8);
|
|
explain select * from t2 straight_join t1 where t1.a=t2.a and b is null;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t2 ALL NULL NULL NULL NULL 2
|
|
1 SIMPLE t1 ref a,b a 10 test.t2.a,const 2 Using where; Using index
|
|
drop index b on t1;
|
|
explain select * from t2,t1 where t1.a=t2.a and b is null;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t2 ALL NULL NULL NULL NULL 2
|
|
1 SIMPLE t1 ref a a 10 test.t2.a,const 2 Using where; Using index
|
|
select * from t2,t1 where t1.a=t2.a and b is null;
|
|
a a b
|
|
7 7 NULL
|
|
8 8 NULL
|
|
explain select * from t2,t1 where t1.a=t2.a and (b= 7 or b is null);
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t2 ALL NULL NULL NULL NULL 2
|
|
1 SIMPLE t1 ref_or_null a a 10 test.t2.a,const 4 Using where; Using index
|
|
select * from t2,t1 where t1.a=t2.a and (b= 7 or b is null);
|
|
a a b
|
|
7 7 7
|
|
7 7 NULL
|
|
8 8 7
|
|
8 8 NULL
|
|
explain select * from t2,t1 where (t1.a=t2.a or t1.a is null) and b= 7;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t2 ALL NULL NULL NULL NULL 2
|
|
1 SIMPLE t1 ref_or_null a a 10 test.t2.a,const 4 Using where; Using index
|
|
select * from t2,t1 where (t1.a=t2.a or t1.a is null) and b= 7;
|
|
a a b
|
|
7 7 7
|
|
7 NULL 7
|
|
8 8 7
|
|
8 NULL 7
|
|
explain select * from t2,t1 where (t1.a=t2.a or t1.a is null) and (b= 7 or b is null);
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t2 ALL NULL NULL NULL NULL 2
|
|
1 SIMPLE t1 ref_or_null a a 5 test.t2.a 4 Using where; Using index
|
|
select * from t2,t1 where (t1.a=t2.a or t1.a is null) and (b= 7 or b is null);
|
|
a a b
|
|
7 7 NULL
|
|
7 7 7
|
|
7 NULL 7
|
|
8 8 NULL
|
|
8 8 7
|
|
8 NULL 7
|
|
insert into t2 values (null),(6);
|
|
delete from t1 where a=8;
|
|
explain select * from t2,t1 where t1.a=t2.a or t1.a is null;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t2 ALL NULL NULL NULL NULL 4
|
|
1 SIMPLE t1 ref_or_null a a 5 test.t2.a 4 Using where; Using index
|
|
explain select * from t2,t1 where t1.a<=>t2.a or (t1.a is null and t1.b <> 9);
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t2 ALL NULL NULL NULL NULL 4
|
|
1 SIMPLE t1 ref_or_null a a 5 test.t2.a 4 Using where; Using index
|
|
select * from t2,t1 where t1.a<=>t2.a or (t1.a is null and t1.b <> 9);
|
|
a a b
|
|
7 7 NULL
|
|
7 7 7
|
|
7 NULL 7
|
|
8 NULL 7
|
|
NULL NULL 7
|
|
NULL NULL 9
|
|
NULL NULL 9
|
|
6 6 6
|
|
6 NULL 7
|
|
drop table t1,t2;
|
|
CREATE TABLE t1 (
|
|
id int(10) unsigned NOT NULL auto_increment,
|
|
uniq_id int(10) unsigned default NULL,
|
|
PRIMARY KEY (id),
|
|
UNIQUE KEY idx1 (uniq_id)
|
|
) ENGINE=MyISAM;
|
|
CREATE TABLE t2 (
|
|
id int(10) unsigned NOT NULL auto_increment,
|
|
uniq_id int(10) unsigned default NULL,
|
|
PRIMARY KEY (id)
|
|
) ENGINE=MyISAM;
|
|
INSERT INTO t1 VALUES (1,NULL),(2,NULL),(3,1),(4,2),(5,NULL),(6,NULL),(7,3),(8,4),(9,NULL),(10,NULL);
|
|
INSERT INTO t2 VALUES (1,NULL),(2,NULL),(3,1),(4,2),(5,NULL),(6,NULL),(7,3),(8,4),(9,NULL),(10,NULL);
|
|
explain select id from t1 where uniq_id is null;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 ref idx1 idx1 5 const 1 Using where
|
|
explain select id from t1 where uniq_id =1;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 SIMPLE t1 const idx1 idx1 5 const 1
|
|
UPDATE t1 SET id=id+100 where uniq_id is null;
|
|
UPDATE t2 SET id=id+100 where uniq_id is null;
|
|
select id from t1 where uniq_id is null;
|
|
id
|
|
101
|
|
102
|
|
105
|
|
106
|
|
109
|
|
110
|
|
select id from t2 where uniq_id is null;
|
|
id
|
|
101
|
|
102
|
|
105
|
|
106
|
|
109
|
|
110
|
|
DELETE FROM t1 WHERE uniq_id IS NULL;
|
|
DELETE FROM t2 WHERE uniq_id IS NULL;
|
|
SELECT * FROM t1 ORDER BY uniq_id, id;
|
|
id uniq_id
|
|
3 1
|
|
4 2
|
|
7 3
|
|
8 4
|
|
SELECT * FROM t2 ORDER BY uniq_id, id;
|
|
id uniq_id
|
|
3 1
|
|
4 2
|
|
7 3
|
|
8 4
|
|
DROP table t1,t2;
|
|
CREATE TABLE `t1` (
|
|
`order_id` char(32) NOT NULL default '',
|
|
`product_id` char(32) NOT NULL default '',
|
|
`product_type` int(11) NOT NULL default '0',
|
|
PRIMARY KEY (`order_id`,`product_id`,`product_type`)
|
|
) ENGINE=MyISAM;
|
|
CREATE TABLE `t2` (
|
|
`order_id` char(32) NOT NULL default '',
|
|
`product_id` char(32) NOT NULL default '',
|
|
`product_type` int(11) NOT NULL default '0',
|
|
PRIMARY KEY (`order_id`,`product_id`,`product_type`)
|
|
) ENGINE=MyISAM;
|
|
INSERT INTO t1 (order_id, product_id, product_type) VALUES
|
|
('3d7ce39b5d4b3e3d22aaafe9b633de51',1206029, 3),
|
|
('3d7ce39b5d4b3e3d22aaafe9b633de51',5880836, 3),
|
|
('9d9aad7764b5b2c53004348ef8d34500',2315652, 3);
|
|
INSERT INTO t2 (order_id, product_id, product_type) VALUES
|
|
('9d9aad7764b5b2c53004348ef8d34500',2315652, 3);
|
|
select t1.* from t1
|
|
left join t2 using(order_id, product_id, product_type)
|
|
where t2.order_id=NULL;
|
|
order_id product_id product_type
|
|
select t1.* from t1
|
|
left join t2 using(order_id, product_id, product_type)
|
|
where t2.order_id is NULL;
|
|
order_id product_id product_type
|
|
3d7ce39b5d4b3e3d22aaafe9b633de51 1206029 3
|
|
3d7ce39b5d4b3e3d22aaafe9b633de51 5880836 3
|
|
drop table t1,t2;
|
|
create table t1 (id int);
|
|
insert into t1 values (null), (0);
|
|
create table t2 (id int);
|
|
insert into t2 values (null);
|
|
select * from t1, t2 where t1.id = t2.id;
|
|
id id
|
|
alter table t1 add key id (id);
|
|
select * from t1, t2 where t1.id = t2.id;
|
|
id id
|
|
drop table t1,t2;
|
|
create table t1 (
|
|
id integer,
|
|
id2 integer not null,
|
|
index (id),
|
|
index (id2)
|
|
);
|
|
insert into t1 values(null,null),(1,1);
|
|
Warnings:
|
|
Warning 1263 Data truncated; NULL supplied to NOT NULL column 'id2' at row 1
|
|
select * from t1;
|
|
id id2
|
|
NULL 0
|
|
1 1
|
|
select * from t1 where id <=> null;
|
|
id id2
|
|
NULL 0
|
|
select * from t1 where id <=> null or id > 0;
|
|
id id2
|
|
NULL 0
|
|
1 1
|
|
select * from t1 where id is null or id > 0;
|
|
id id2
|
|
NULL 0
|
|
1 1
|
|
select * from t1 where id2 <=> null or id2 > 0;
|
|
id id2
|
|
1 1
|
|
select * from t1 where id2 is null or id2 > 0;
|
|
id id2
|
|
1 1
|
|
delete from t1 where id <=> NULL;
|
|
select * from t1;
|
|
id id2
|
|
1 1
|
|
drop table t1;
|