Commit a875ceaf authored by unknown's avatar unknown
Browse files

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

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
parents 73c6702f 6843d1d8

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -1121,3 +1121,5 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl

support-files/MacOSX/postflight

support-files/MacOSX/preflight

client/mysql.cc

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ static struct my_option my_long_options[] = 
   NO_ARG, 0, 0, 0, 0, 0, 0},

#endif

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

   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,

   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,

   0},

  {"prompt", OPT_PROMPT, "Set the mysql prompt to this value.",

   (gptr*) &current_prompt, (gptr*) &current_prompt, 0, GET_STR_ALLOC,

configure.in

+1 −1
Original line number Diff line number Diff line 
dnl -*- ksh -*-

dnl Process this file with autoconf to produce a configure script.



AC_PREREQ(2.57)dnl		Minimum Autoconf version required.

AC_PREREQ(2.52)dnl		Minimum Autoconf version required.



AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

sql/sql_class.cc

+2 −2
Original line number Diff line number Diff line
@@ -1863,7 +1863,7 @@ static void xid_free_hash (void *ptr) 
bool xid_cache_init()

{

  pthread_mutex_init(&LOCK_xid_cache, MY_MUTEX_INIT_FAST);

  hash_init(&xid_cache, &my_charset_bin, 100, 0, 0,

  return hash_init(&xid_cache, &my_charset_bin, 100, 0, 0,

                   xid_get_hash_key, xid_free_hash, 0) != 0;

}