Commit 63205a7e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.1 

into  mysql.com:/home/mydev/mysql-5.1-bug11527
parents 97c82803 de7ac129

client/mysqltest.c

+4 −2
Original line number Diff line number Diff line
@@ -3662,8 +3662,10 @@ DYNAMIC_ARRAY patterns; 
static void init_win_path_patterns()

{

  /* List of string patterns to match in order to find paths */

  const char* paths[] = { "$MYSQL_TEST_DIR", "./test/", 0 };

  int num_paths= 2;

  const char* paths[] = { "$MYSQL_TEST_DIR",

                          "$MYSQL_TMP_DIR",

                          "./test/", 0 };

  int num_paths= 3;

  int i;

  char* p;

include/my_global.h

+9 −0
Original line number Diff line number Diff line
@@ -43,6 +43,15 @@ 
#define HAVE_ERRNO_AS_DEFINE

#endif /* __CYGWIN__ */



#if defined(__QNXNTO__) && !defined(FD_SETSIZE)

#define FD_SETSIZE 1024         /* Max number of file descriptor bits in

                                   fd_set, used when calling 'select'

                                   Must be defined before including

                                   "sys/select.h" and "sys/time.h"

                                 */

#endif





/* to make command line shorter we'll define USE_PRAGMA_INTERFACE here */

#ifdef USE_PRAGMA_IMPLEMENTATION

#define USE_PRAGMA_INTERFACE

mysql-test/extra/binlog_tests/insert_select-binlog.test

+4 −0
Original line number Diff line number Diff line 
# Embedded server doesn't support binlog

-- source include/not_embedded.inc



--disable_warnings

drop table if exists t1,t2;

--enable_warnings



# Check if a partly-completed INSERT SELECT in a MyISAM table goes into the

# binlog

mysql-test/mysql-test-run.pl

+2 −1
Original line number Diff line number Diff line
@@ -1156,6 +1156,7 @@ sub environment_setup () { 
  $ENV{'USE_RUNNING_SERVER'}= $glob_use_running_server;

  $ENV{'MYSQL_TEST_DIR'}=     $glob_mysql_test_dir;

  $ENV{'MYSQLTEST_VARDIR'}=   $opt_vardir;

  $ENV{'MYSQL_TMP_DIR'}=      $opt_tmpdir;

  $ENV{'MASTER_MYSOCK'}=      $master->[0]->{'path_mysock'};

  $ENV{'MASTER_MYSOCK1'}=     $master->[1]->{'path_mysock'};

  $ENV{'MASTER_MYPORT'}=      $master->[0]->{'path_myport'};
@@ -2876,7 +2877,7 @@ sub run_mysqltest ($) { 
  if ( $opt_debug )

  {

    $cmdline_mysqlcheck .=

      " --debug=d:t:A,$opt_vardir_trace/log/mysqldump.trace";

      " --debug=d:t:A,$opt_vardir_trace/log/mysqlcheck.trace";

  }



  my $cmdline_mysqldump= "$exe_mysqldump --no-defaults -uroot " .

mysql-test/mysql-test-run.sh

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ SYST=0 
REALT=0

FAST_START=""

MYSQL_TMP_DIR=$MYSQL_TEST_DIR/var/tmp

export MYSQL_TMP_DIR



# Use a relative path for where the slave will find the dumps

# generated by "LOAD DATA" on the master. The path is relative