Commit 87b06d07 authored by unknown's avatar unknown
Browse files

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

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
parents 2ef66fca 388e8843

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/select.result

+10 −0
Original line number Diff line number Diff line
@@ -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 42000: Key 'a' doesn't exist in table 't1'

EXPLAIN SELECT * FROM t1 FORCE INDEX (a);

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

mysql-test/t/select.test

+17 −2
Original line number Diff line number Diff line
@@ -2264,6 +2264,21 @@ insert into t2 values(1,1); 
select * from t1 where f1 in (select f3 from t2 where (f3,f4)= (select f3,f4 from t2)); 

drop table t1,t2;



#

# Bug #17873: confusing error message when IGNORE INDEX refers a column name

#



CREATE TABLE t1 (a int, INDEX idx(a));

INSERT INTO t1 VALUES (2), (3), (1);



EXPLAIN SELECT * FROM t1 IGNORE INDEX (idx);

--error 1176

EXPLAIN SELECT * FROM t1 IGNORE INDEX (a);

--error 1176

EXPLAIN SELECT * FROM t1 FORCE INDEX (a);



DROP TABLE t1;



# End of 4.1 tests



#

scripts/make_sharedlib_distribution.sh

+4 −2
Original line number Diff line number Diff line
@@ -45,9 +45,11 @@ fi 
mkdir -p $BASE/lib



for i in \

  libmysql/.libs/libmysqlclient.s{l,o}* \

  libmysql/.libs/libmysqlclient.so* \

  libmysql/.libs/libmysqlclient.sl* \

  libmysql/.libs/libmysqlclient*.dylib \

  libmysql_r/.libs/libmysqlclient_r.s{l,o}* \

  libmysql_r/.libs/libmysqlclient_r.so* \

  libmysql_r/.libs/libmysqlclient_r.sl* \

  libmysql_r/.libs/libmysqlclient_r*.dylib

do

  if [ -f $i ]