Commit 56934f9d authored by unknown's avatar unknown
Browse files

Merge trift2.:/MySQL/M41/push-4.1 

into  trift2.:/MySQL/M50/push-5.0


BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Auto merged
configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/time.cc:
  Auto merged
myisam/sort.c:
  Manual merge: "use local" (= 5.0 version).
mysql-test/mysql-test-run.pl:
  Manual merge, part of the fix for bug#17194.
parents 694227c0 aa341c49

mysql-test/install_test_db.sh

+12 −5
Original line number Diff line number Diff line 
#!/bin/sh

# Copyright (C) 1997-2002 MySQL AB

# Copyright (C) 1997-2006 MySQL AB

# For a more info consult the file COPYRIGHT distributed with this file



# This scripts creates the privilege tables db, host, user, tables_priv,
@@ -7,19 +7,26 @@ 


if [ x$1 = x"--bin" ]; then

  shift 1

  BINARY_DIST=1



  bindir=../bin

  scriptdir=../bin

  libexecdir=../libexec



  # Check if it's a binary distribution or a 'make install'

  if test -x ../libexec/mysqld

  then

    execdir=../libexec

  elif test -x ../../sbin/mysqld  # RPM installation

  then

    execdir=../../sbin

    bindir=../../bin

    scriptdir=../../bin

    libexecdir=../../libexec

  else

    execdir=../bin

  fi

  bindir=../bin

  BINARY_DIST=1

  fix_bin=mysql-test

  scriptdir=../bin

  libexecdir=../libexec

else

  execdir=../sql

  bindir=../client

mysql-test/mysql-test-run.pl

+22 −3
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ our $opt_ndbconnectstring_slave; 


our $opt_record;

our $opt_check_testcases;

my  $opt_report_features;



our $opt_skip;

our $opt_skip_rpl;
@@ -642,7 +643,7 @@ sub command_line_setup () { 


  $glob_hostname=  mtr_short_hostname();



  # 'basedir' is always parent of "mysql-test" directory

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

  $glob_mysql_test_dir=  cwd();

  if ( $glob_cygwin_perl )

  {
@@ -650,11 +651,19 @@ 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, ...

  $glob_basedir=         dirname($glob_mysql_test_dir);

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

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

  {

    $glob_basedir=       dirname($glob_basedir);

  }



  # Expect mysql-bench to be located adjacent to the source tree, by default

  $glob_mysql_bench_dir= "$glob_basedir/../mysql-bench"

    unless defined $glob_mysql_bench_dir;

  $glob_mysql_bench_dir= undef

    unless -d $glob_mysql_bench_dir;



  $path_my_basedir=

    $opt_source_dist ? $glob_mysql_test_dir : $glob_basedir;
@@ -682,7 +691,8 @@ sub command_line_setup () { 
				       "$path_client_bindir/mysqld-debug",

				       "$path_client_bindir/mysqld-max",

				       "$glob_basedir/libexec/mysqld",

				       "$glob_basedir/bin/mysqld");

				       "$glob_basedir/bin/mysqld",

				       "$glob_basedir/sbin/mysqld");



  # Use the mysqld found above to find out what features are available

  collect_mysqld_features();
@@ -799,6 +809,13 @@ sub command_line_setup () { 
    $opt_vardir= "$glob_mysql_test_dir/$opt_vardir";

  }



  # Ensure a proper error message 

  mkpath("$opt_vardir");

  unless ( -d $opt_vardir and -w $opt_vardir )

  {

    mtr_error("Writable 'var' directory is needed, use the '--vardir' option");

  }



  # --------------------------------------------------------------------------

  # Set tmpdir

  # --------------------------------------------------------------------------
@@ -1320,7 +1337,9 @@ sub executable_setup_im () { 
  $exe_im=

    mtr_exe_maybe_exists(

      "$glob_basedir/server-tools/instance-manager/mysqlmanager",

      "$glob_basedir/libexec/mysqlmanager");

      "$glob_basedir/libexec/mysqlmanager",

      "$glob_basedir/bin/mysqlmanager",

      "$glob_basedir/sbin/mysqlmanager");



  return ($exe_im eq "");

}

mysql-test/mysql-test-run.sh

+28 −10
Original line number Diff line number Diff line
@@ -174,18 +174,29 @@ fi 
# Misc. Definitions

#--



if [ -d ../sql ] ; then

# BASEDIR is always above mysql-test directory ...

MYSQL_TEST_DIR=`pwd`

cd ..



if [ -d ./sql ] ; then

   SOURCE_DIST=1

else

   BINARY_DIST=1

fi



#BASEDIR is always one above mysql-test directory

CWD=`pwd`

# ... one level for tar.gz, two levels for a RPM installation

if [ -d ./bin ] ; then

   # this is not perfect: we have 

   #   /usr/share/mysql/   # mysql-test-run  is here, so this is "$MYSQL_TEST_DIR"

   #   /usr/bin/           # with MySQL client programs

   # so the existence of "/usr/share/bin/" would make this test fail.

   BASEDIR=`pwd`

else

   cd ..

   BASEDIR=`pwd`

cd $CWD

MYSQL_TEST_DIR=$BASEDIR/mysql-test

fi



cd $MYSQL_TEST_DIR

MYSQL_TEST_WINDIR=$MYSQL_TEST_DIR

MYSQLTEST_VARDIR=$MYSQL_TEST_DIR/var

export MYSQL_TEST_DIR MYSQL_TEST_WINDIR MYSQLTEST_VARDIR
@@ -744,8 +755,15 @@ else 
 if test -x "$BASEDIR/libexec/mysqld"

 then

   MYSQLD="$VALGRIND $BASEDIR/libexec/mysqld"

 else

 elif test -x "$BASEDIR/bin/mysqld"

 then

   MYSQLD="$VALGRIND $BASEDIR/bin/mysqld"

 elif test -x "$BASEDIR/sbin/mysqld"

 then

   MYSQLD="$VALGRIND $BASEDIR/sbin/mysqld"

 else

   $ECHO "Fatal error: Cannot find program mysqld in $BASEDIR/{libexec,bin,sbin}" 1>&2

   exit 1

 fi

 CLIENT_BINDIR="$BASEDIR/bin"

 if test -d "$BASEDIR/tests"
@@ -1390,7 +1408,7 @@ start_master() 
    then

      $ECHO "set args $master_args" > $GDB_MASTER_INIT$1

      $ECHO "To start gdb for the master , type in another window:"

      $ECHO "cd $CWD ; gdb -x $GDB_MASTER_INIT$1 $MASTER_MYSQLD"

      $ECHO "cd $MYSQL_TEST_DIR ; gdb -x $GDB_MASTER_INIT$1 $MASTER_MYSQLD"

      wait_for_master=1500

    else

      ( $ECHO set args $master_args;
@@ -1508,7 +1526,7 @@ start_slave() 
    then

      $ECHO "set args $slave_args" > $GDB_SLAVE_INIT

      echo "To start gdb for the slave, type in another window:"

      echo "cd $CWD ; gdb -x $GDB_SLAVE_INIT $SLAVE_MYSQLD"

      echo "cd $MYSQL_TEST_DIR ; gdb -x $GDB_SLAVE_INIT $SLAVE_MYSQLD"

      wait_for_slave=1500

    else

      ( $ECHO set args $slave_args;

mysql-test/t/rename.test

+0 −3
Original line number Diff line number Diff line
@@ -60,9 +60,6 @@ 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