Commit d889c1a8 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BUILD/compile-dist:
  Auto merged
client/mysqltest.c:
  Auto merged
config/ac-macros/ssl.m4:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/group_min_max.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/rpl_insert_id_pk.result:
  Auto merged
mysql-test/r/rpl_ndb_multi_update3.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/r/rpl_ndb_sp006.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_clock.c:
  Auto merged
mysys/my_copy.c:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_dup.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/my_redel.c:
  Auto merged
mysql-test/r/create.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/r/join_outer.result:
  Manual merge
mysql-test/t/func_group.test:
  Manual merge
mysql-test/t/group_min_max.test:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge
parents 9f9d7e0a d7b474e1

client/mysqltest.c

+3 −3
Original line number Diff line number Diff line
@@ -2518,7 +2518,7 @@ int safe_connect(MYSQL* mysql, const char *host, const char *user, 
{

  int con_error= 1;

  my_bool reconnect= 1;

  static int connection_retry_sleep= 2; /* Seconds */

  static ulong connection_retry_sleep= 100000; /* Microseconds */

  int i;

  for (i= 0; i < opt_max_connect_retries; i++)

  {
@@ -2528,7 +2528,7 @@ int safe_connect(MYSQL* mysql, const char *host, const char *user, 
      con_error= 0;

      break;

    }

    sleep(connection_retry_sleep);

    my_sleep(connection_retry_sleep);

  }

  /*

   TODO: change this to 0 in future versions, but the 'kill' test relies on
@@ -3301,7 +3301,7 @@ static struct my_option my_long_options[] = 
  {"max-connect-retries", OPT_MAX_CONNECT_RETRIES,

   "Max number of connection attempts when connecting to server",

   (gptr*) &opt_max_connect_retries, (gptr*) &opt_max_connect_retries, 0,

   GET_INT, REQUIRED_ARG, 5, 1, 10, 0, 0, 0},

   GET_INT, REQUIRED_ARG, 500, 1, 10000, 0, 0, 0},

  {"password", 'p', "Password to use when connecting to server.",

   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},

  {"port", 'P', "Port number to use for connection.", (gptr*) &port,

include/config-win.h

+0 −10
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ functions */ 


#include <sys/locking.h>

#include <windows.h>

#include <math.h>			/* Because of rint() */

#include <fcntl.h>

#include <io.h>

#include <malloc.h>
@@ -223,17 +222,9 @@ typedef uint rf_SetTimer; 
#define inline __inline

#endif /* __cplusplus */



inline double rint(double nr)

{

  double f = floor(nr);

  double c = ceil(nr);

  return (((c-nr) >= (nr-f)) ? f :c);

}



#ifdef _WIN64

#define ulonglong2double(A) ((double) (ulonglong) (A))

#define my_off_t2double(A)  ((double) (my_off_t) (A))



#else

inline double ulonglong2double(ulonglong value)

{
@@ -339,7 +330,6 @@ inline double ulonglong2double(ulonglong value) 
#define HAVE_FLOAT_H

#define HAVE_LIMITS_H

#define HAVE_STDDEF_H

#define HAVE_RINT		/* defined in this file */

#define NO_FCNTL_NONBLOCK	/* No FCNTL */

#define HAVE_ALLOCA

#define HAVE_STRPBRK

include/my_base.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#define _my_base_h



#ifndef stdin				/* Included first in handler */

#define USES_TYPES			/* my_dir with sys/types is included */

#define CHSIZE_USED

#include <my_global.h>

#include <my_dir.h>			/* This includes types */

mysql-test/extra/rpl_tests/rpl_insert_id_pk.test

+2 −1
Original line number Diff line number Diff line
@@ -83,5 +83,6 @@ SET FOREIGN_KEY_CHECKS=0; 
--error 1022, 1062

INSERT INTO t1 VALUES (1),(1);

sync_slave_with_master;



connection master;

drop table t1;

# End of 4.1 tests

mysql-test/extra/rpl_tests/rpl_loaddata.test

+1 −1
Original line number Diff line number Diff line
@@ -152,5 +152,5 @@ wait_for_slave_to_stop; 
drop table t2;

connection master;

drop table t2;



drop table t1;

# End of 4.1 tests