Commit e741023f authored by unknown's avatar unknown
Browse files

Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/bkroot/mysql-4.1
parents 24b0fab9 8e8c1a47

client/mysqltest.c

+0 −8
Original line number Diff line number Diff line
@@ -949,11 +949,7 @@ static void do_exec(struct st_query* q) 
    while (fgets(buf, sizeof(buf), res_file))

      replace_dynstr_append_mem(ds, buf, strlen(buf));

  }

#ifndef __WIN__

  error= pclose(res_file);

#else  

  error= _pclose(res_file);

#endif  



  if (error != 0)

    die("command \"%s\" failed", cmd);
@@ -4610,11 +4606,7 @@ FILE *my_popen(const char *cmd, const char *mode __attribute__((unused))) 
  FILE *res_file;



  subst_cmd= subst_env_var(cmd);

#ifndef __WIN__

  res_file= popen(subst_cmd, "r0");

#else

  res_file= _popen(subst_cmd, "r0");

#endif

  my_free(subst_cmd, MYF(0));

  return res_file;

}

include/config-win.h

+2 −0
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ typedef uint rf_SetTimer; 
#define sigset(A,B) signal((A),(B))

#define finite(A) _finite(A)

#define sleep(A)  Sleep((A)*1000)

#define popen(A) popen(A,B) _popen((A),(B))

#define pclose(A) _pclose(A)



#ifndef __BORLANDC__

#define access(A,B) _access(A,B)

mysql-test/ndb/ndbcluster.sh

+7 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ if [ -d ../sql ] ; then 
   exec_ndb=$ndbtop/src/kernel/ndbd

   exec_mgmtsrvr=$ndbtop/src/mgmsrv/ndb_mgmd

   exec_waiter=$ndbtop/tools/ndb_waiter

   exec_test=$ndbtop/tools/ndb_test_platform

   exec_mgmtclient=$ndbtop/src/mgmclient/ndb_mgm

else

   BINARY_DIST=1
@@ -34,9 +35,15 @@ else 
     exec_mgmtsrvr=$BASEDIR/bin/ndb_mgmd

   fi

   exec_waiter=$BASEDIR/bin/ndb_waiter

   exec_waiter=$BASEDIR/bin/ndb_test_platform

   exec_mgmtclient=$BASEDIR/bin/ndb_mgm

fi



if $exec_test ; then :; else

  echo "ndb not correctly compiled to support this platform"

  exit 1

fi



pidfile=ndbcluster.pid

cfgfile=Ndb.cfg

stop_ndb=

mysql-test/t/rpl_failed_optimize-master.opt

+1 −1
Original line number Diff line number Diff line 
--innodb-lock-wait-timeout=1
 
--loose-innodb-lock-wait-timeout=1

ndb/test/include/NDBT_Test.hpp

+2 −2
Original line number Diff line number Diff line
@@ -392,10 +392,10 @@ C##suitname():NDBT_TestSuite(#suitname){ \ 


// Add a number of equal steps to the testcase

#define STEPS(stepfunc, num) \

  for (int i = 0; i < num; i++){ \

  { int i; for (i = 0; i < num; i++){ \

    pts = new NDBT_ParallelStep(pt, #stepfunc, stepfunc); \

    pt->addStep(pts);\

  }

  } }



#define VERIFIER(stepfunc) \

  ptv = new NDBT_Verifier(pt, #stepfunc, stepfunc); \