Commit 06af76d2 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


sql/ha_ndbcluster.cc:
  Auto merged
parents baa7f2a3 3e085bd8

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1286,3 +1286,5 @@ vio/viotest.cpp 
zlib/*.ds?

zlib/*.vcproj

BitKeeper/etc/RESYNC_TREE

mysql-test/r/*.log

scripts/mysql_upgrade_shell

heap/hp_test1.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int main(int argc, char **argv) 
  bzero((gptr) flags,sizeof(flags));



  printf("- Creating heap-file\n");

  if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000L,101L,

  if (heap_create(filename,1,keyinfo,30,(ulong) flag*100000L,10L,

		  &hp_create_info) ||

      !(file= heap_open(filename, 2)))

    goto err;

include/my_handler.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#ifndef _my_handler_h

#define _my_handler_h



#include "my_global.h"

#include "my_base.h"

#include "m_ctype.h"

#include "myisampack.h"

libmysql/libmysql.c

+3 −4
Original line number Diff line number Diff line
@@ -2391,10 +2391,9 @@ static void net_store_datetime(NET *net, MYSQL_TIME *tm) 


static void store_param_date(NET *net, MYSQL_BIND *param)

{

  MYSQL_TIME *tm= (MYSQL_TIME *) param->buffer;

  tm->hour= tm->minute= tm->second= 0;

  tm->second_part= 0;

  net_store_datetime(net, tm);

  MYSQL_TIME tm= *((MYSQL_TIME *) param->buffer);

  tm.hour= tm.minute= tm.second= tm.second_part= 0;

  net_store_datetime(net, &tm);

}



static void store_param_datetime(NET *net, MYSQL_BIND *param)

mysql-test/mysql-test-run.sh

+7 −13
Original line number Diff line number Diff line
@@ -1381,16 +1381,16 @@ start_master() 


  if [ x$DO_DDD = x1 ]

  then

    $ECHO "set args $master_args" > $GDB_MASTER_INIT

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

    manager_launch master ddd -display $DISPLAY --debugger \

    "gdb -x $GDB_MASTER_INIT" $MASTER_MYSQLD

    "gdb -x $GDB_MASTER_INIT$1" $MASTER_MYSQLD

  elif [ x$DO_GDB = x1 ]

  then

    if [ x$MANUAL_GDB = x1 ]

    then

      $ECHO "set args $master_args" > $GDB_MASTER_INIT

      $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 $MASTER_MYSQLD"

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

      wait_for_master=1500

    else

      ( $ECHO set args $master_args;
@@ -1402,9 +1402,9 @@ disa 1 
end

r

EOF

      fi )  > $GDB_MASTER_INIT

      fi )  > $GDB_MASTER_INIT$1

      manager_launch master $XTERM -display $DISPLAY \

      -title "Master" -e gdb -x $GDB_MASTER_INIT $MASTER_MYSQLD

      -title "Master" -e gdb -x $GDB_MASTER_INIT$1 $MASTER_MYSQLD

    fi

  else

    manager_launch master $MASTER_MYSQLD $master_args
@@ -2088,13 +2088,7 @@ then 
  fi



  start_manager



# Do not automagically start daemons if we are in gdb or running only one test

# case

  if [ -z "$DO_GDB" ] && [ -z "$DO_DDD" ]

  then

  mysql_start

  fi

  $ECHO  "Loading Standard Test Databases"

  mysql_loadstd

fi