Commit ca589a4f authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/usr/home/tim/m/bk/g50 

into  siva.hindu.god:/usr/home/tim/m/bk/50


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_class.h:
  Auto merged
parents 6de718d2 377cfb8b

cmd-line-utils/readline/histfile.c

+2 −1
Original line number Diff line number Diff line
@@ -334,7 +334,8 @@ history_truncate_file (fname, lines) 
  file_size = (size_t)finfo.st_size;



  /* check for overflow on very large files */

  if (file_size != finfo.st_size || file_size + 1 < file_size)

  if ((long long) file_size != (long long) finfo.st_size ||

      file_size + 1 < file_size)

    {

      close (file);

#if defined (EFBIG)

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.32)

AM_INIT_AUTOMAKE(mysql, 5.0.34)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=32

NDB_VERSION_BUILD=34

NDB_VERSION_STATUS=""



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

innobase/dict/dict0dict.c

+16 −13
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ Created 1/8/1996 Heikki Tuuri 
#include "que0que.h"

#include "rem0cmp.h"



/* Implement isspace() in a locale-independent way. (Bug #24299) */

#define ib_isspace(c) strchr(" \v\f\t\r\n", c)



dict_sys_t*	dict_sys	= NULL;	/* the dictionary system */



rw_lock_t	dict_operation_lock;	/* table create, drop, etc. reserve
@@ -2406,7 +2409,7 @@ dict_accept( 


	*success = FALSE;

	

	while (isspace(*ptr)) {

	while (ib_isspace(*ptr)) {

		ptr++;

	}
@@ -2451,7 +2454,7 @@ dict_scan_id( 


	*id = NULL;



	while (isspace(*ptr)) {

	while (ib_isspace(*ptr)) {

		ptr++;

	}
@@ -2482,7 +2485,7 @@ dict_scan_id( 
			len++;

		}

	} else {

		while (!isspace(*ptr) && *ptr != '(' && *ptr != ')'

		while (!ib_isspace(*ptr) && *ptr != '(' && *ptr != ')'

		       && (accept_also_dot || *ptr != '.')

		       && *ptr != ',' && *ptr != '\0') {
@@ -2512,12 +2515,12 @@ dict_scan_id( 
	if (heap && !quote) {

		/* EMS MySQL Manager sometimes adds characters 0xA0 (in

		latin1, a 'non-breakable space') to the end of a table name.

		But isspace(0xA0) is not true, which confuses our foreign key

		parser. After the UTF-8 conversion in ha_innodb.cc, bytes 0xC2

		and 0xA0 are at the end of the string.

		After the UTF-8 conversion in ha_innodb.cc, bytes 0xC2

		and 0xA0 are at the end of the string, and ib_isspace()

		does not work for multi-byte UTF-8 characters.



		TODO: we should lex the string using thd->charset_info, and

		my_isspace(). Only after that, convert id names to UTF-8. */

		In MySQL 5.1 we lex the string using thd->charset_info, and

		my_isspace(). This workaround is not needed there. */



		b = (byte*)(*id);

		id_len = strlen((char*) b);
@@ -3006,11 +3009,11 @@ dict_create_foreign_constraints_low( 


		ut_a(success);



		if (!isspace(*ptr) && *ptr != '"' && *ptr != '`') {

		if (!ib_isspace(*ptr) && *ptr != '"' && *ptr != '`') {

	        	goto loop;

		}



		while (isspace(*ptr)) {

		while (ib_isspace(*ptr)) {

			ptr++;

		}
@@ -3052,7 +3055,7 @@ dict_create_foreign_constraints_low( 
		goto loop;

	}



	if (!isspace(*ptr)) {

	if (!ib_isspace(*ptr)) {

	        goto loop;

	}
@@ -3140,7 +3143,7 @@ dict_create_foreign_constraints_low( 
	}

	ptr = dict_accept(ptr, "REFERENCES", &success);



	if (!success || !isspace(*ptr)) {

	if (!success || !ib_isspace(*ptr)) {

		dict_foreign_report_syntax_err(name, start_of_latest_foreign,

									ptr);

		return(DB_CANNOT_ADD_CONSTRAINT);
@@ -3527,7 +3530,7 @@ dict_foreign_parse_drop_constraints( 


	ptr = dict_accept(ptr, "DROP", &success);



	if (!isspace(*ptr)) {

	if (!ib_isspace(*ptr)) {



	        goto loop;

	}

innobase/include/row0mysql.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ Created 9/17/2000 Heikki Tuuri 
#include "btr0pcur.h"

#include "trx0types.h"



extern ibool row_rollback_on_timeout;



typedef struct row_prebuilt_struct row_prebuilt_t;



/***********************************************************************

innobase/include/sync0rw.h

+10 −4
Original line number Diff line number Diff line
@@ -61,7 +61,11 @@ Creates, or rather, initializes an rw-lock object in a specified memory 
location (which must be appropriately aligned). The rw-lock is initialized

to the non-locked state. Explicit freeing of the rw-lock with rw_lock_free

is necessary only if the memory block containing it is freed. */

#define rw_lock_create(L) rw_lock_create_func((L), __FILE__, __LINE__, #L)

#ifdef UNIV_DEBUG

# define rw_lock_create(L) rw_lock_create_func((L), #L, __FILE__, __LINE__)

#else /* UNIV_DEBUG */

# define rw_lock_create(L) rw_lock_create_func((L), __FILE__, __LINE__)

#endif /* UNIV_DEBUG */



/*=====================*/

/**********************************************************************
@@ -74,9 +78,11 @@ void 
rw_lock_create_func(

/*================*/

	rw_lock_t*	lock,		/* in: pointer to memory */

#ifdef UNIV_DEBUG

	const char*	cmutex_name, 	/* in: mutex name */

#endif /* UNIV_DEBUG */

	const char*	cfile_name,	/* in: file name where created */

  ulint cline,  /* in: file line where created */

  const char* cmutex_name); /* in: mutex name */

	ulint		cline);		/* in: file line where created */

/**********************************************************************

Calling this function is obligatory only if the memory buffer containing

the rw-lock is freed. Removes an rw-lock object from the global list. The