Commit 76343a5d authored by unknown's avatar unknown
Browse files

Post-merge fixes

parent 34c6f402

mysql-test/include/common-tests.inc

+2 −2
Original line number Diff line number Diff line
@@ -1296,9 +1296,9 @@ explain select fld3 from t2 use index (fld1,fld3) where fld3 = 'honeysuckle'; 
# The next should give an error

#



-- error 1072

-- error 1176

explain select fld3 from t2 ignore index (fld3,not_used);

-- error 1072

-- error 1176

explain select fld3 from t2 use index (not_used);



#

mysql-test/r/compress.result

+2 −2
Original line number Diff line number Diff line
@@ -145,9 +145,9 @@ explain select fld3 from t2 use index (fld1,fld3) where fld3 = 'honeysuckle'; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	fld3	fld3	30	const	1	Using where; Using index

explain select fld3 from t2 ignore index (fld3,not_used);

ERROR 42000: Key column 'not_used' doesn't exist in table

ERROR HY000: Key 'not_used' doesn't exist in table 't2'

explain select fld3 from t2 use index (not_used);

ERROR 42000: Key column 'not_used' doesn't exist in table

ERROR HY000: Key 'not_used' doesn't exist in table 't2'

select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3;

fld3

honeysuckle

mysql-test/r/key_cache.result

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ Table Op Msg_type Msg_text 
test.t1	assign_to_keycache	error	Key 'unknown_key' doesn't exist in table 't1'

test.t1	assign_to_keycache	status	Operation failed

Warnings:

Error	1072	Key column 'unknown_key' doesn't exist in table

Error	1176	Key 'unknown_key' doesn't exist in table 't1'

select @@keycache2.key_buffer_size;

@@keycache2.key_buffer_size

4194304

mysql-test/r/preload.result

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ test.t2 preload_keys error Key 'c' doesn't exist in table 't2' 
test.t2	preload_keys	status	Operation failed

Warnings:

Error	1146	Table 'test.t3' doesn't exist

Error	1072	Key column 'c' doesn't exist in table

Error	1176	Key 'c' doesn't exist in table 't2'

show status like "key_read%";

Variable_name	Value

Key_read_requests	0

mysql-test/r/select.result

+12 −2
Original line number Diff line number Diff line
@@ -144,9 +144,9 @@ explain select fld3 from t2 use index (fld1,fld3) where fld3 = 'honeysuckle'; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	fld3	fld3	30	const	1	Using where; Using index

explain select fld3 from t2 ignore index (fld3,not_used);

ERROR 42000: Key column 'not_used' doesn't exist in table

ERROR HY000: Key 'not_used' doesn't exist in table 't2'

explain select fld3 from t2 use index (not_used);

ERROR 42000: Key column 'not_used' doesn't exist in table

ERROR HY000: Key 'not_used' doesn't exist in table 't2'

select t2.fld3 from t2 where fld3 >= 'honeysuckle' and fld3 <= 'honoring' order by fld3;

fld3

honeysuckle
@@ -2716,6 +2716,16 @@ select * from t1 where f1 in (select f3 from t2 where (f3,f4)= (select f3,f4 fro 
f1	f2

1	1

drop table t1,t2;

CREATE TABLE t1 (a int, INDEX idx(a));

INSERT INTO t1 VALUES (2), (3), (1);

EXPLAIN SELECT * FROM t1 IGNORE INDEX (idx);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	

EXPLAIN SELECT * FROM t1 IGNORE INDEX (a);

ERROR HY000: Key 'a' doesn't exist in table 't1'

EXPLAIN SELECT * FROM t1 FORCE INDEX (a);

ERROR HY000: Key 'a' doesn't exist in table 't1'

DROP TABLE t1;

CREATE TABLE t1 ( city char(30) );

INSERT INTO t1 VALUES ('London');

INSERT INTO t1 VALUES ('Paris');