Commit 13930f0e authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
parents 626abed3 d104671c

Build-tools/Do-compile

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ $ENV{'MYSQL_TCP_PORT'}= $mysql_tcp_port= 3334 + $opt_build_thread*2; 
$ENV{'MYSQL_UNIX_PORT'}=$mysql_unix_port="$opt_tmp/mysql$opt_suffix.build";

$ENV{"PERL5LIB"}="$pwd/$host/perl5:$pwd/$host/perl5/site_perl";

$slave_port=$mysql_tcp_port+16;

$ndbcluster_port= 9350 + $opt_build_thread*2;

$ndbcluster_port= 9350 + $opt_build_thread*4;

$manager_port=$mysql_tcp_port+1;

$mysqladmin_args="--no-defaults -u root --connect_timeout=5 --shutdown_timeout=20";

configure.in

+0 −10
Original line number Diff line number Diff line
@@ -1531,14 +1531,11 @@ then 
  fi

fi



TOOLS_LIBS="$NON_THREADED_CLIENT_LIBS"



# Should we use named pthread library ?

AC_MSG_CHECKING("named thread libs:")

if test "$with_named_thread" != "no"

then

  LIBS="$with_named_thread $LIBS $with_named_thread"

  TOOLS_LIBS="$with_named_thread $TOOLS_LIBS $with_named_thread"

  with_posix_threads="yes"

  with_mit_threads="no"

  AC_MSG_RESULT("$with_named_thread")
@@ -1557,9 +1554,7 @@ else 
    then

      AC_MSG_CHECKING("for pthread_create in -lpthread");

      ac_save_LIBS="$LIBS"

      ac_save_TOOLS_LIBS="$TOOLS_LIBS"

      LIBS="$LIBS -lpthread"

      TOOLS_LIBS="$TOOLS_LIBS -lpthread"

      AC_TRY_LINK(

      [#include <pthread.h>],

      [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
@@ -1568,7 +1563,6 @@ else 
      if test "$with_posix_threads" = "no"

      then

        LIBS=" $ac_save_LIBS -lpthreads"

        TOOLS_LIBS=" $ac_save_TOOLS_LIBS -lpthreads"

        AC_MSG_CHECKING("for pthread_create in -lpthreads");

        AC_TRY_LINK(

        [#include <pthread.h>],
@@ -1579,7 +1573,6 @@ else 
        then

	  # This is for FreeBSD

	  LIBS="$ac_save_LIBS -pthread"

	  TOOLS_LIBS="$ac_save_TOOLS_LIBS -pthread"

	  AC_MSG_CHECKING("for pthread_create in -pthread");

	  AC_TRY_LINK(

	  [#include <pthread.h>],
@@ -1590,7 +1583,6 @@ else 
	  then

	    with_mit_threads="yes"

	    LIBS="$ac_save_LIBS"

	    TOOLS_LIBS="$ac_save_TOOLS_LIBS"

	  fi

	fi

      fi
@@ -2656,8 +2648,6 @@ AC_SUBST(sql_union_dirs) 
# Some usefull subst

AC_SUBST(CC)

AC_SUBST(GXX)

#Remove TOOLS_LIBS, because this is included in LIBRARIES

#AC_SUBST(TOOLS_LIBS)



# Set configuration options for make_binary_distribution

case $SYSTEM_TYPE in

innobase/include/rem0rec.ic

+2 −2
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ bits of a record. (Only compact records have status bits.) */ 
UNIV_INLINE

ulint

rec_get_info_and_status_bits(

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

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

			/* out: info bits */

	rec_t*	rec,	/* in: physical record */

	ibool	comp)	/* in: TRUE=compact page format */
@@ -550,7 +550,7 @@ bits of a record. (Only compact records have status bits.) */ 
UNIV_INLINE

void

rec_set_info_and_status_bits(

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

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

	rec_t*	rec,	/* in: physical record */

	ibool	comp,	/* in: TRUE=compact page format */

	ulint	bits)	/* in: info bits */

innobase/include/trx0trx.h

+3 −1
Original line number Diff line number Diff line
@@ -383,7 +383,9 @@ struct trx_struct{ 
	dulint		commit_lsn;	/* lsn at the time of the commit */

	ibool		dict_operation;	/* TRUE if the trx is used to create

					a table, create an index, or drop a

					table */

					table.  This is a hint that the table

					may need to be dropped in crash

					recovery. */

	dulint		table_id;	/* table id if the preceding field is

					TRUE */

	/*------------------------------*/

innobase/row/row0mysql.c

+0 −12
Original line number Diff line number Diff line
@@ -2561,17 +2561,6 @@ do not allow the TRUNCATE. We also reserve the data dictionary latch. */ 
		goto funct_exit;

	}



	if (table->n_mysql_handles_opened > 1) {

		ut_print_timestamp(stderr);

fputs("	 InnoDB: Warning: MySQL is trying to truncate table ", stderr);

		ut_print_name(stderr, trx, table->name);

		fputs("\n"

"InnoDB: though there are still open handles to it.\n", stderr);

		err = DB_ERROR;



		goto funct_exit;

	}



	/* TODO: could we replace the counter n_foreign_key_checks_running

	with lock checks on the table? Acquire here an exclusive lock on the

	table, and rewrite lock0lock.c and the lock wait in srv0srv.c so that
@@ -2594,7 +2583,6 @@ fputs(" InnoDB: Warning: MySQL is trying to truncate table ", stderr); 


	lock_reset_all_on_table(table);



	trx->dict_operation = TRUE;

	trx->table_id = table->id;



	/* scan SYS_INDEXES for all indexes of the table */