Commit 24d9820d authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-5.0
parents b3e7d6fa c851595c

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ dlenev@build.mysql.com 
dlenev@jabberwock.localdomain

dlenev@mysql.com

ejonore@mc03.ndb.mysql.com

gbichot@production.mysql.com

gbichot@quadita2.mysql.com

gbichot@quadxeon.mysql.com

georg@beethoven.local

Docs/mysqld_error.txt

+2 −0
Original line number Diff line number Diff line
@@ -595,3 +595,5 @@ character-set=latin1 
"Invalid ON UPDATE clause for '%-.64s' field",

#define ER_UNSUPPORTED_PS 1295

"This command is not supported in the prepared statement protocol yet",

#define ER_CANT_CREATE_USER_WITH_GRANT 1296

"You are not allowed to create a user with GRANT"

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ 
#undef MYSQL_SERVER

#include "client_priv.h"

#include <my_time.h>

#include "log_event.h"

/* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */

#include "mysql_priv.h" 

#include "log_event.h"



#define BIN_LOG_HEADER_SIZE	4

#define PROBE_HEADER_LEN	(EVENT_LEN_OFFSET+4)

client/mysqldump.c

+2 −3
Original line number Diff line number Diff line
@@ -1396,10 +1396,9 @@ static uint getTableStructure(char *table, char* db) 
      /* Get MySQL specific create options */

      if (create_options)

      {

	char show_name_buff[FN_REFLEN];

	char show_name_buff[NAME_LEN*2+2+24];



	/* Check memory for quote_for_like() */

	DBUG_ASSERT(2*sizeof(table) < sizeof(show_name_buff));

        my_snprintf(buff, sizeof(buff), "show table status like %s",

		    quote_for_like(table, show_name_buff));

client/mysqltest.c

+14 −2
Original line number Diff line number Diff line
@@ -2746,8 +2746,13 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) 
	append_result(ds, res);

      }



      /* Add all warnings to the result */

      if (!disable_warnings && mysql_warning_count(mysql))

      /*

        Add all warnings to the result. We can't do this if we are in

        the middle of processing results from multi-statement, because

        this will break protocol.

      */

      if (!disable_warnings && !mysql_more_results(mysql) &&

          mysql_warning_count(mysql))

      {

	MYSQL_RES *warn_res=0;

	uint count= mysql_warning_count(mysql);
@@ -3363,6 +3368,13 @@ static void run_query_stmt_handle_warnings(MYSQL *mysql, DYNAMIC_STRING *ds) 


  if (!disable_warnings && (count= mysql_warning_count(mysql)))

  {

    /*

      If one day we will support execution of multi-statements

      through PS API we should not issue SHOW WARNINGS until

      we have not read all results...

    */

    DBUG_ASSERT(!mysql_more_results(mysql));



    if (mysql_real_query(mysql, "SHOW WARNINGS", 13) == 0)

    {

      MYSQL_RES *warn_res= mysql_store_result(mysql);