Commit ed44a2ee authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 

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


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/func_group.result:
  Merge manually
mysql-test/t/func_group.test:
  Merge manually
parents 695c534d 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",

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 */

include/mysql_com.h

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ enum enum_server_command 


#define SERVER_STATUS_IN_TRANS     1	/* Transaction has started */

#define SERVER_STATUS_AUTOCOMMIT   2	/* Server in auto_commit mode */

#define SERVER_STATUS_MORE_RESULTS 4	/* More results on server */

#define SERVER_MORE_RESULTS_EXISTS 8    /* Multi query - next query exists */

#define SERVER_QUERY_NO_GOOD_INDEX_USED 16

#define SERVER_QUERY_NO_INDEX_USED      32