Commit d0dad4bf 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.1-0


BitKeeper/deleted/.del-generate_prefix_files.pl:
  Delete: extra/yassl/include/openssl/generate_prefix_files.pl
BitKeeper/deleted/.del-prefix_crypto.h:
  Delete: extra/yassl/include/openssl/prefix_crypto.h
BitKeeper/deleted/.del-prefix_ssl.h:
  Delete: extra/yassl/include/openssl/prefix_ssl.h
BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7:
  Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
  Auto merged
BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/yassl/include/openssl/crypto.h:
  Auto merged
extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/include/yassl_int.hpp:
  Auto merged
extra/yassl/src/Makefile.am:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
extra/yassl/src/template_instnt.cpp:
  Auto merged
extra/yassl/src/yassl_int.cpp:
  Auto merged
extra/yassl/testsuite/Makefile.am:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
include/violite.h:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
mysql-test/include/common-tests.inc:
  Auto merged
mysql-test/r/analyze.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/key_cache.result:
  Auto merged
mysql-test/r/preload.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/analyze.test:
  Auto merged
mysql-test/t/explain.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
vio/Makefile.am:
  Auto merged
client/Makefile.am:
  Manual merge
libmysqld/Makefile.am:
  Manual merge
mysql-test/r/compress.result:
  Manual merge
mysql-test/r/explain.result:
  Manual merge
mysql-test/r/select.result:
  Manual merge
mysql-test/r/view.result:
  Manual merge
mysql-test/t/select.test:
  Manual merge
mysql-test/t/view.test:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
parents 65f125ff f153c5af

client/Makefile.am

+7 −7
Original line number Diff line number Diff line
@@ -83,13 +83,13 @@ link_sources: 
	for f in $(sql_src) ; do \

	  rm -f $$f; \

	  @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \

	done;

         done; \

        for f in $(strings_src) ; do \

          rm -f $(srcdir)/$$f; \

          @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \

	done;

	-rm -f $(srcdir)/my_user.c;

	@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c

         done; \

         rm -f $(srcdir)/my_user.c; \

         @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;





# Don't update the files from bitkeeper

extra/yassl/include/openssl/generate_prefix_files.pl

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

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

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

explain select fld3 from t2 use index (not_used);

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

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

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

explain select fld3 from t2 use index (not_used);

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

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');