Commit 979aa2e1 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


configure.in:
  Auto merged
parents 45256b35 2eb3dd20

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.1.13-beta)

AM_INIT_AUTOMAKE(mysql, 5.1.14-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

mysql-test/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ dist-hook: 
	-$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(distdir)/extra/binlog_tests

	-$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.opt $(distdir)/extra/rpl_tests

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include

	$(INSTALL_DATA) $(srcdir)/include/*.test $(distdir)/include

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r

	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data
@@ -98,6 +99,7 @@ install-data-local: 
	-$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(DESTDIR)$(testdir)/extra/binlog_tests

	-$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.opt $(DESTDIR)$(testdir)/extra/rpl_tests

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include

	$(INSTALL_DATA) $(srcdir)/include/*.test $(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

mysql-test/mysql-test-run.pl

+14 −6
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ sub command_line_setup () { 


  $glob_hostname=  mtr_short_hostname();



  # 'basedir' is always above "mysql-test" directory ...

  # Find the absolute path to the test directory

  $glob_mysql_test_dir=  cwd();

  if ( $glob_cygwin_perl )

  {
@@ -651,10 +651,18 @@ sub command_line_setup () { 
    $glob_mysql_test_dir= `cygpath -m "$glob_mysql_test_dir"`;

    chomp($glob_mysql_test_dir);

  }

  # ... direct parent for "tar.gz" installations, ...



  # In most cases, the base directory we find everything relative to,

  # is the parent directory of the "mysql-test" directory. For source

  # distributions, TAR binary distributions and some other packages.

  $glob_basedir= dirname($glob_mysql_test_dir);

  # ... or one more level up, for RPM installations.

  if ( ! -d "$glob_basedir/bin" )



  # In the RPM case, binaries and libraries are installed in the

  # default system locations, instead of having our own private base

  # directory. And we install "/usr/share/mysql-test". Moving up one

  # more directory relative to "mysql-test" gives us a usable base

  # directory for RPM installs.

  if ( ! $opt_source_dist and ! -d "$glob_basedir/bin" )

  {

    $glob_basedir= dirname($glob_basedir);

  }

mysql-test/t/rename.test

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ send RENAME TABLE t1 TO t2, t3 to t4; 
connection con2;

show tables;

UNLOCK TABLES;

connection con1;

reap;

connection con2;



# Wait for the the tables to be renamed

# i.e the query below succeds

scripts/make_binary_distribution.sh

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ $CP mysql-test/lib/*.pl $BASE/mysql-test/lib 
$CP mysql-test/lib/*.sql $BASE/mysql-test/lib

$CP mysql-test/t/*.def $BASE/mysql-test/t

$CP mysql-test/include/*.inc $BASE/mysql-test/include

$CP mysql-test/include/*.test $BASE/mysql-test/include

$CP mysql-test/t/*.def $BASE/mysql-test/t

$CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \

    mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \