Commit f153c5af authored by unknown's avatar unknown
Browse files

Merge rurik.mysql.com:/home/igor/mysql-5.0 

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
parents 726351f5 76343a5d

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/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 42000: Key column 'foo' doesn't exist in table

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

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

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

ERROR HY000: 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/key_cache.result

+2 −2
Original line number Diff line number Diff line
@@ -191,10 +191,10 @@ cache index t1 in unknown_key_cache; 
ERROR HY000: Unknown key cache 'unknown_key_cache'

cache index t1 key (unknown_key) in keycache1;

Table	Op	Msg_type	Msg_text

test.t1	assign_to_keycache	error	Key column 'unknown_key' doesn't exist in table

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

+2 −2
Original line number Diff line number Diff line
@@ -160,11 +160,11 @@ Key_reads 0 
load index into cache t3 key (b), t2 key (c) ;

Table	Op	Msg_type	Msg_text

test.t3	preload_keys	error	Table 'test.t3' doesn't exist

test.t2	preload_keys	error	Key column 'c' doesn't exist in table

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