Commit 4faee665 authored by unknown's avatar unknown
Browse files

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

into  zim.(none):/home/ian/workspace/mysql-5.0
parents 12a09a35 63605b9f

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -1275,3 +1275,6 @@ zlib/*.ds? 
zlib/*.vcproj

scripts/mysql_upgrade

include/openssl

mysql-test/r/bdb.log

mysql-test/r/im_client_port.log

mysql-test/r/udf.log

client/mysql.cc

+9 −2
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static struct my_option my_long_options[] = 
   "Base name of shared memory.", (gptr*) &shared_memory_base_name, (gptr*) &shared_memory_base_name, 

   0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#endif

  {"socket", 'S', "Socket file to use for connection.",

  {"socket", 'S', "Socket file to use for connection. (This will override --port unless --protocol=TCP is specified.)",

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

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

#include "sslopt-longopts.h"
@@ -940,6 +940,13 @@ static int get_options(int argc, char **argv) 
    connect_flag= 0; /* Not in interactive mode */

  }



  if (opt_mysql_port && (!opt_protocol) && (!opt_mysql_unix_port))

  {

    /* Not checking return type since we are using a constant value */

    /* straight from the initialization of sql_protocol_typelib.    */

    opt_protocol= find_type("TCP", &sql_protocol_typelib, 0);

  }



  if (strcmp(default_charset, charset_info->csname) &&

      !(charset_info= get_charset_by_csname(default_charset, 

					    MY_CS_PRIMARY, MYF(MY_WME))))

mysql-test/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ 


sp-goto         : GOTO is currently is disabled - will be fixed in the future

ndb_load        : Bug#17233

udf             : Bug#18564 (Permission by Brian)