Commit 3459da7d authored by unknown's avatar unknown
Browse files

Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge


client/mysql.cc:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysys/my_open.c:
  Auto merged
BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/time.cc:
  Auto merged
client/mysqltest.c:
  Manual merge.
mysql-test/r/ps_1general.result:
  Manual merge.
parents 6fb4287a 1cf65f31

BitKeeper/etc/collapsed

0 → 100644
+1 −0
Original line number Diff line number Diff line 
44d03f27qNdqJmARzBoP3Is_cN5e0w

mysql-test/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.*001 $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data

mysql-test/r/ps_1general.result

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ t9 MyISAM 10 Dynamic 2 216 432 # 2048 0 NULL # # # latin1_swedish_ci NULL 
prepare stmt4 from ' show status like ''Threads_running'' ';

execute stmt4;

Variable_name	Value

Threads_running	2

Threads_running	#

prepare stmt4 from ' show variables like ''sql_mode'' ';

execute stmt4;

Variable_name	Value

mysql-test/t/ps_1general.test

+1 −0
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ prepare stmt4 from ' show table status from test like ''t9%'' '; 
--replace_column 8 # 12 # 13 # 14 #

# Bug#4288

execute stmt4;

--replace_column 2 #

prepare stmt4 from ' show status like ''Threads_running'' ';

execute stmt4;

prepare stmt4 from ' show variables like ''sql_mode'' ';

mysql-test/t/sp.test

+0 −1
Original line number Diff line number Diff line
@@ -5951,7 +5951,6 @@ drop table t3| 
drop procedure bug15217|





#

# Bug#21002 "Derived table not selecting from a "real" table fails in JOINs"

#         

# A regression caused by the fix for Bug#18444: for derived tables we should