Commit 388e8843 authored by unknown's avatar unknown
Browse files

Post-merge fixes

parent 156a1662

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 HY000: Key 'not_used' doesn't exist in table 't2'

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

explain select fld3 from t2 use index (not_used);

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

ERROR 42000: 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/explain.result

+2 −2
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ explain select * from t1 use key (str,str) where str="foo"; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	const	str	str	11	const	1	

explain select * from t1 use key (str,str,foo) where str="foo";

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

ERROR 42000: Key 'foo' doesn't exist in table 't1'

explain select * from t1 ignore key (str,str,foo) where str="foo";

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

ERROR 42000: Key 'foo' doesn't exist in table 't1'

drop table t1;

explain select 1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

mysql-test/r/select.result

+4 −4
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 HY000: Key 'not_used' doesn't exist in table 't2'

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

explain select fld3 from t2 use index (not_used);

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

ERROR 42000: 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
@@ -2722,9 +2722,9 @@ 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'

ERROR 42000: 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'

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

DROP TABLE t1;

CREATE TABLE t1 ( city char(30) );

INSERT INTO t1 VALUES ('London');

mysql-test/r/ssl.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 HY000: Key 'not_used' doesn't exist in table 't2'

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

explain select fld3 from t2 use index (not_used);

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

ERROR 42000: 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/ssl_compress.result

+2 −2
Original line number Diff line number Diff line
@@ -148,9 +148,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 HY000: Key 'not_used' doesn't exist in table 't2'

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

explain select fld3 from t2 use index (not_used);

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

ERROR 42000: 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