Commit cc78467d authored by unknown's avatar unknown
Browse files

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/space/my/mysql-4.1


sql/ha_myisammrg.cc:
  Auto merged
parents f30b7ed4 5f767b11

client/sql_string.cc

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


/* This file is originally from the mysql distribution. Coded by monty */



#ifdef __GNUC__

#ifdef USE_PRAGMA_IMPLEMENTATION

#pragma implementation				// gcc: Class implementation

#endif

client/sql_string.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


/* This file is originally from the mysql distribution. Coded by monty */



#ifdef __GNUC__

#ifdef USE_PRAGMA_INTERFACE

#pragma interface			/* gcc class implementation */

#endif

include/my_global.h

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ 
#define USE_PRAGMA_INTERFACE

#endif



/* Determine when to use "#pragma implementation" */

#if !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)

#define USE_PRAGMA_IMPLEMENTATION

#endif



#if defined(i386) && !defined(__i386__)

#define __i386__

#endif

innobase/row/row0mysql.c

+5 −0
Original line number Diff line number Diff line
@@ -2575,6 +2575,7 @@ row_drop_table_for_mysql( 
	foreign = UT_LIST_GET_FIRST(table->referenced_list);

	

	while (foreign && foreign->foreign_table == table) {

	check_next_foreign:

		foreign = UT_LIST_GET_NEXT(referenced_list, foreign);

	}
@@ -2603,6 +2604,10 @@ row_drop_table_for_mysql( 
		goto funct_exit;

	}



	if (foreign && trx->check_foreigns) {

		goto check_next_foreign;

	}



	if (table->n_mysql_handles_opened > 0) {

		ibool	added;

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -1181,8 +1181,8 @@ start_master() 
           $NOT_FIRST_MASTER_EXTRA_OPTS"

  fi



  CUR_MYERR=$MASTER_MYERR

  CUR_MYSOCK=$MASTER_MYSOCK

  CUR_MYERR=$MASTER_MYERR$1

  CUR_MYSOCK=$MASTER_MYSOCK$1



  # For embedded server we collect the server flags and return

  if [ "x$USE_EMBEDDED_SERVER" = "x1" ] ; then