Commit e3164272 authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


innobase/include/trx0trx.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
parents 82182de3 6ed02deb

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));

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ AC_PREREQ(2.50)dnl Minimum Autoconf version required. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# Don't forget to also update the NDB lines below.

AM_INIT_AUTOMAKE(mysql, 5.0.3-alpha)

AM_INIT_AUTOMAKE(mysql, 5.0.3-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -18,7 +18,7 @@ SHARED_LIB_VERSION=14:0:0 
NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=3

NDB_VERSION_STATUS="alpha"

NDB_VERSION_STATUS="beta"



# Set all version vars based on $VERSION. How do we do this more elegant ?

# Remember that regexps needs to quote [ and ] since this is run through m4