Commit f3919e92 authored by unknown's avatar unknown
Browse files

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

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


include/mysql.h:
  Auto merged
include/sql_common.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/ps.result:
  Manual merge.
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
sql/sql_prepare.cc:
  Manual merge.
sql/table.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.
parents ed19079c d57c41b7

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

include/sql_common.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ cli_advanced_command(MYSQL *mysql, enum enum_server_command command, 
		     const char *header, ulong header_length,

		     const char *arg, ulong arg_length, my_bool skip_check,

                     MYSQL_STMT *stmt);



unsigned long cli_safe_read(MYSQL *mysql);

void set_stmt_errmsg(MYSQL_STMT * stmt, const char *err, int errcode,

		     const char *sqlstate);

void set_mysql_error(MYSQL *mysql, int errcode, const char *sqlstate);

libmysql/libmysql.c

+9 −7
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ int cli_read_change_user_result(MYSQL *mysql, char *buff, const char *passwd) 
  NET *net= &mysql->net;

  ulong pkt_length;



  pkt_length= net_safe_read(mysql);

  pkt_length= cli_safe_read(mysql);

  

  if (pkt_length == packet_error)

    return 1;
@@ -666,7 +666,7 @@ int cli_read_change_user_result(MYSQL *mysql, char *buff, const char *passwd) 
      return 1;

    }

    /* Read what server thinks about out new auth message report */

    if (net_safe_read(mysql) == packet_error)

    if (cli_safe_read(mysql) == packet_error)

      return 1;

  }

  return 0;
@@ -1887,7 +1887,7 @@ my_bool cli_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt) 
  DBUG_ENTER("cli_read_prepare_result");



  mysql= mysql->last_used_con;

  if ((packet_length= net_safe_read(mysql)) == packet_error)

  if ((packet_length= cli_safe_read(mysql)) == packet_error)

    DBUG_RETURN(1);

  mysql->warning_count= 0;
@@ -2505,7 +2505,8 @@ int cli_stmt_execute(MYSQL_STMT *stmt) 


  if (stmt->param_count)

  {

    NET        *net= &stmt->mysql->net;

    MYSQL *mysql= stmt->mysql;

    NET        *net= &mysql->net;

    MYSQL_BIND *param, *param_end;

    char       *param_data;

    ulong length;
@@ -2517,7 +2518,8 @@ int cli_stmt_execute(MYSQL_STMT *stmt) 
      set_stmt_error(stmt, CR_PARAMS_NOT_BOUND, unknown_sqlstate);

      DBUG_RETURN(1);

    }

    if (stmt->mysql->status != MYSQL_STATUS_READY)

    if (mysql->status != MYSQL_STATUS_READY ||

        mysql->server_status & SERVER_MORE_RESULTS_EXISTS)

    {

      set_stmt_error(stmt, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);

      DBUG_RETURN(1);
@@ -4532,7 +4534,7 @@ static int stmt_fetch_row(MYSQL_STMT *stmt, uchar *row) 


int cli_unbuffered_fetch(MYSQL *mysql, char **row)

{

  if (packet_error == net_safe_read(mysql))

  if (packet_error == cli_safe_read(mysql))

    return 1;



  *row= ((mysql->net.read_pos[0] == 254) ? NULL :
@@ -4641,7 +4643,7 @@ int cli_read_binary_rows(MYSQL_STMT *stmt) 


  mysql= mysql->last_used_con;



  while ((pkt_len= net_safe_read(mysql)) != packet_error)

  while ((pkt_len= cli_safe_read(mysql)) != packet_error)

  {

    cp= net->read_pos;

    if (cp[0] != 254 || pkt_len >= 8)