Commit 6017f911 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt


client/mysql.cc:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.h:
  Auto merged
parents 6e5d9284 3c8150b7

BitKeeper/etc/collapsed

0 → 100644
+1 −0
Original line number Diff line number Diff line 
44d03f27qNdqJmARzBoP3Is_cN5e0w

client/mysql.cc

+2 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,8 @@ static bool add_line(String &buffer,char *line,char *in_string, 
      continue;

    }

#endif

    if (!*ml_comment && inchar == '\\')

    if (!*ml_comment && inchar == '\\' &&

        !(mysql.server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES))

    {

      // Found possbile one character command like \c

client/mysqlbinlog.cc

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
/* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */

#include "mysql_priv.h" 

#include "log_event.h"

#include "sql_common.h"



#define BIN_LOG_HEADER_SIZE	4

#define PROBE_HEADER_LEN	(EVENT_LEN_OFFSET+4)
@@ -1077,7 +1078,7 @@ could be out of memory"); 
    const char *error_msg;

    Log_event *ev;



    len = net_safe_read(mysql);

    len= cli_safe_read(mysql);

    if (len == packet_error)

    {

      fprintf(stderr, "Got error reading packet from server: %s\n",

client/mysqltest.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static void die(const char *fmt, ...) 
    if (cur_file && cur_file != file_stack)

      fprintf(stderr, "In included file \"%s\": ",

              cur_file->file_name);

    if (start_lineno != 0)

    if (start_lineno > 0)

      fprintf(stderr, "At line %u: ", start_lineno);

    vfprintf(stderr, fmt, args);

    fprintf(stderr, "\n");

include/mysql.h

+0 −1
Original line number Diff line number Diff line
@@ -848,7 +848,6 @@ int STDCALL mysql_drop_db(MYSQL *mysql, const char *DB); 
#define stmt_command(mysql, command, arg, length, stmt) \

  (*(mysql)->methods->advanced_command)(mysql, command, NullS,  \

                                        0, arg, length, 1, stmt)

unsigned long net_safe_read(MYSQL* mysql);



#ifdef __NETWARE__

#pragma pack(pop)		/* restore alignment */