Commit eb51f9e0 authored by unknown's avatar unknown
Browse files

Merge rurik.mysql.com:/home/igor/tmp_merge 

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
  Auto merged
BitKeeper/deleted/.del-sql_state.h~4307ea5f1fe99019:
  Auto merged
mysql-test/r/explain.result:
  Auto merged
mysql-test/r/key_cache.result:
  Auto merged
mysql-test/r/preload.result:
  Auto merged
mysql-test/t/explain.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/sql_base.cc:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~11edc4db89248c16:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~184eb1f09242dc72:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~2cdeb8d6f80eba72:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~587903f9311db2d1:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~606dfaeb9e81aa4e:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~6bbd9eac7f0e6b89:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~7397c423c52c6d2c:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~898865062c970766:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~94a93cc742fca24d:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~9dab24f7fb11b1e1:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~b6181e29d8282b06:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~ba132dc9bc936c8a:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~e2609fdf7870795:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~e3183b99fbba0a9c:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~eeb2c47537ed9c23:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~ef28b592c7591b7:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~f19bfd5d4c918964:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Manual merge
BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150:
  Manual merge
BitKeeper/deleted/.del-mysqld_error.h~9dac75782467aab7:
  Manual merge
parents 4aef3b22 f27a0eed

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

+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	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

mysql-test/r/preload.result

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,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	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

mysql-test/r/select.result

+209 −931

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/t/explain.test

+2 −2
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ explain select * from t1 ignore key (str) where str="foo"; 
explain select * from t1 use key (str,str) where str="foo";



#The following should give errors

--error 1072

--error 1176

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

--error 1072

--error 1176

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

drop table t1;