Commit e897eb34 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 

into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
parents e5eab7dd 19758ce6

client/mysql.cc

+2 −0
Original line number Diff line number Diff line
@@ -1010,10 +1010,12 @@ static int read_and_execute(bool interactive) 
#elif defined(__WIN__)

      if (!tmpbuf.is_alloced())

        tmpbuf.alloc(65535);

      tmpbuf.length(0);

      buffer.length(0);

      unsigned long clen;

      do

      {

	line= my_cgets((char*)tmpbuf.ptr(), tmpbuf.alloced_length()-1, &clen);

        buffer.append(line, clen);

        /* 

           if we got buffer fully filled than there is a chance that

configure.in

+2 −2
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.0.15)

AM_INIT_AUTOMAKE(mysql, 5.0.16)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -18,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=15

NDB_VERSION_BUILD=16

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

mysql-test/my_manage.c

+4 −1
Original line number Diff line number Diff line
@@ -230,7 +230,10 @@ int wait_for_server_start(char *bin_dir __attribute__((unused)), 
                          char *user, char *password, int port,char *tmp_dir)

{

  arg_list_t al;

  int err= 0, i;

  int err= 0;

#ifndef __WIN__

  int i;

#endif

  char trash[FN_REFLEN];



  /* mysqladmin file */

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ our $opt_sleep_time_after_restart= 1; 
our $opt_sleep_time_for_delete=    10;

our $opt_testcase_timeout;

our $opt_suite_timeout;

my  $default_testcase_timeout=     10; # 10 min max

my  $default_testcase_timeout=     15; # 15 min max

my  $default_suite_timeout=       120; # 2 hours max



our $opt_socket;

mysql-test/mysql_test_run_new.c

+0 −1
Original line number Diff line number Diff line
@@ -1741,7 +1741,6 @@ int main(int argc, char **argv) 
      int* handle;

      char test[FN_LEN];

      char mask[FN_REFLEN];

      char *p;

      int position;



      /* single test */