Commit f27a0eed authored by unknown's avatar unknown
Browse files

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  rurik.mysql.com:/home/igor/mysql-4.1
parents 8e60a6a4 a2993441

include/mysqld_error.h

+1 −1
Original line number Diff line number Diff line
@@ -319,5 +319,5 @@ 
#define ER_INVALID_CHARACTER_STRING 1300

#define ER_WARN_ALLOWED_PACKET_OVERFLOWED 1301

#define ER_CONFLICTING_DECLARATIONS 1302

#define ER_INDEX_DOES_NOT_EXIST 1303

/* Attention: 1302 must be the last error code in 4.1 */

#define ER_ERROR_MESSAGES 303

include/sql_state.h

+0 −1
Original line number Diff line number Diff line
@@ -162,4 +162,3 @@ ER_WARN_DATA_TRUNCATED, "01000", "", 
ER_WRONG_NAME_FOR_INDEX,        "42000", "",

ER_WRONG_NAME_FOR_CATALOG,      "42000", "",

ER_UNKNOWN_STORAGE_ENGINE,      "42000", "",
 
ER_INDEX_DOES_NOT_EXIST,        "42000", "",

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: Index 'foo' is not defined for table 't1'

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

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

ERROR 42000: Index 'foo' is not defined for table 't1'

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

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ 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	Index 'unknown_key' is not defined for table 't1'

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

test.t1	assign_to_keycache	status	Operation failed

select @@keycache2.key_buffer_size;

@@keycache2.key_buffer_size

mysql-test/r/preload.result

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ 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	Index 'c' is not defined for table 't2'

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

test.t2	preload_keys	status	Operation failed

show status like "key_read%";

Variable_name	Value