Commit 6154d76c authored by unknown's avatar unknown
Browse files

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

into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0


sql/field.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
parents 13ec3ef6 147640b8

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -382,8 +382,11 @@ libmysqld/examples/link_sources 
libmysqld/examples/my_readline.h

libmysqld/examples/mysql

libmysqld/examples/mysql.cc

libmysqld/examples/mysql_client_test.c

libmysqld/examples/mysql_client_test_embedded

libmysqld/examples/mysqltest

libmysqld/examples/mysqltest.c

libmysqld/examples/mysqltest_embedded

libmysqld/examples/readline.cc

libmysqld/examples/sql_string.cc

libmysqld/examples/sql_string.h

BUILD/compile-pentium64-debug

0 → 100755
+13 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium64_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs $static_link"



extra_configs="$extra_configs "



. "$path/FINISH.sh"

VC++Files/libmysqld/libmysqld.dsp

+0 −4
Original line number Diff line number Diff line
@@ -228,10 +228,6 @@ SOURCE=..\sql\ha_innodb.cpp 
# End Source File

# Begin Source File



SOURCE=..\sql\ha_isammrg.cpp

# End Source File

# Begin Source File



SOURCE=..\sql\ha_myisam.cpp

# End Source File

# Begin Source File

VC++Files/mysqldemb/mysqldemb.dsp

+0 −4
Original line number Diff line number Diff line
@@ -169,10 +169,6 @@ SOURCE=..\sql\ha_innodb.cpp 
# End Source File

# Begin Source File



SOURCE=..\sql\ha_isammrg.cpp

# End Source File

# Begin Source File



SOURCE=..\sql\ha_myisam.cpp

# End Source File

# Begin Source File

client/mysqlbinlog.cc

+9 −6
Original line number Diff line number Diff line
@@ -752,9 +752,13 @@ static MYSQL* safe_connect() 
  if (opt_protocol)

    mysql_options(local_mysql, MYSQL_OPT_PROTOCOL, (char*) &opt_protocol);

  if (!mysql_real_connect(local_mysql, host, user, pass, 0, port, sock, 0))

    die("failed on connect: %s", mysql_error(local_mysql));

  {

    char errmsg[256];

    strmake(errmsg, mysql_error(local_mysql), sizeof(errmsg)-1);

    mysql_close(local_mysql);

    die("failed on connect: %s", errmsg);

  }

  local_mysql->reconnect= 1;



  return local_mysql;

}
@@ -781,8 +785,7 @@ static int check_master_version(MYSQL* mysql, 
  if (mysql_query(mysql, "SELECT VERSION()") ||

      !(res = mysql_store_result(mysql)))

  {

    char errmsg[FN_REFLEN];



    char errmsg[256];

    strmake(errmsg, mysql_error(mysql), sizeof(errmsg)-1);

    mysql_close(mysql);

    die("Error checking master version: %s", errmsg);