Merge trift2.:/MySQL/M51/clone-5.1

into trift2.:/MySQL/M51/push-5.1

Merge trift2.:/MySQL/M51/clone-5.1
into trift2.:/MySQL/M51/push-5.1
0d27df6f · joerg@trift2 · b5e1d6f2 · da721fe7 · 0d27df6f · 0d27df6f
Commit 0d27df6f authored Nov 01, 2006 by joerg@trift2
33 changed files
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -66,7 +66,7 @@ INSTALL-BINARY:	mysql.info $(GT)
 # It is not in BitKeeper, but is downloaded from intranet by Bootstrap.
 dist-hook:
 	if [ -e $(srcdir)/manual.chm ] ; then \
-	  cp $(srcdir)/manual.chm $(distdir); \
+	  cp -f $(srcdir)/manual.chm $(distdir); \
 	fi
 # Don't update the files from bitkeeper

--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -65,6 +65,9 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug yassl taocrypt zlib wsock
 ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl taocrypt zlib wsock32)
+ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
+TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient mysys dbug yassl taocrypt zlib wsock32)
 ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl taocrypt zlib wsock32)

--- a/config/ac-macros/plugins.m4
+++ b/config/ac-macros/plugins.m4
@@ -253,6 +253,29 @@ AC_DEFUN([MYSQL_PLUGIN_ACTIONS],[
 ])
 ])
+dnl ---------------------------------------------------------------------------
+dnl Macro: MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS
+dnl
+dnl SYNOPSIS
+dnl   MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS([name],[file name])
+dnl
+dnl DESCRIPTION
+dnl   Some modules in plugins keep dependance on structures
+dnl   declared in sql/ (THD class usually)
+dnl   That has to be fixed in the future, but until then
+dnl   we have to recompile these modules when we want to
+dnl   to compile server parts with the different #defines
+dnl   Normally it happens when we compile the embedded server
+dnl   Thus one should mark such files in his handler using this macro
+dnl    (currently only one such a file per plugin is supported)
+dnl
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS],[
+ MYSQL_REQUIRE_PLUGIN([$1])
+ m4_define([MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS_]AS_TR_CPP([$1]), [$2])
+])
 dnl ---------------------------------------------------------------------------
 dnl Macro: MYSQL_CONFIGURE_PLUGINS
 dnl
@@ -282,6 +305,9 @@ AC_DEFUN([MYSQL_CONFIGURE_PLUGINS],[
    AC_SUBST([mysql_pg_dirs])
    AC_SUBST([mysql_se_unittest_dirs])
    AC_SUBST([mysql_pg_unittest_dirs])
+    AC_SUBST([condition_dependent_plugin_modules])
+    AC_SUBST([condition_dependent_plugin_links])
+    AC_SUBST([condition_dependent_plugin_includes])
   ])
 ])
 ])
@@ -307,6 +333,7 @@ AC_DEFUN([_MYSQL_EMIT_CHECK_PLUGIN],[
  [MYSQL_PLUGIN_DYNAMIC_]AS_TR_CPP([$1]),
  [MYSQL_PLUGIN_MANDATORY_]AS_TR_CPP([$1]),
  [MYSQL_PLUGIN_DISABLED_]AS_TR_CPP([$1]),
+  [MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS_]AS_TR_CPP([$1]),
  [MYSQL_PLUGIN_ACTIONS_]AS_TR_CPP([$1])
 )
 ])
@@ -402,6 +429,11 @@ dnl Although this is "pretty", it breaks libmysqld build
      mysql_plugin_defs="$mysql_plugin_defs, [builtin_]$2[_plugin]"
      [with_plugin_]$2=yes
      AC_MSG_RESULT([yes])
+      m4_ifdef([$11],[
+       condition_dependent_plugin_modules="$condition_dependent_plugin_modules m4_bregexp($11, [[^/]+$], [\&])"
+       condition_dependent_plugin_links="$condition_dependent_plugin_links $6/$11"
+       condition_dependent_plugin_includes="$condition_dependent_plugin_includes -I[\$(top_srcdir)]/$6/m4_bregexp($11, [^.+[/$]], [\&])"
+      ])
    fi
    m4_ifdef([$6],[
      if test -n "$mysql_use_plugin_dir" ; then

--- a/configure.in
+++ b/configure.in
@@ -1441,9 +1441,9 @@ fi
 # dlopen, dlerror
 case "$with_mysqld_ldflags " in
-  *"-static "*)
+  *"-all-static "*)
    # No need to check for dlopen when mysqld is linked with
-    # -all-static or -static as it won't be able to load any functions.
+    # -all-static as it won't be able to load any functions.
    # NOTE! It would be better if it was possible to test if dlopen
    # can be used, but a good way to test it couldn't be found

--- a/include/my_global.h
+++ b/include/my_global.h
@@ -614,12 +614,17 @@ C_MODE_END
 #define _STATIC_VARARGS(X) X
 #define _PC(X)	X
+/* The DBUG_ON flag always takes precedence over default DBUG_OFF */
 #if defined(DBUG_ON) && defined(DBUG_OFF)
 #undef DBUG_OFF
 #endif
-#if defined(_lint) && !defined(DBUG_OFF)
+/* We might be forced to turn debug off, if not turned off already */
-#define DBUG_OFF
+#if (defined(FORCE_DBUG_OFF) || defined(_lint)) && !defined(DBUG_OFF)
+#  define DBUG_OFF
+#  ifdef DBUG_ON
+#    undef DBUG_ON
+#  endif
 #endif
 #include <my_dbug.h>

--- a/include/mysql.h
+++ b/include/mysql.h
@@ -293,12 +293,6 @@ typedef struct st_mysql
  /* needed for embedded server - no net buffer to store the 'info' */
  char *info_buffer;
 #endif
-  /*
-    In embedded server it points to the statement that is processed
-    in the current query. We store some results directly in statement
-    fields then.
-  */
-  struct st_mysql_stmt *current_stmt;
 } MYSQL;
 typedef struct st_mysql_res {

--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -32,7 +32,8 @@ INCLUDES=		-I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \
 			-I$(top_srcdir)/regex \
-			$(openssl_includes) @ZLIB_INCLUDES@
+			$(openssl_includes) @ZLIB_INCLUDES@ \
+			@condition_dependent_plugin_includes@
 noinst_LIBRARIES =	libmysqld_int.a
 pkglib_LIBRARIES =	libmysqld.a
@@ -77,6 +78,8 @@ libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)
 libmysqld_a_SOURCES=
 sqlstoragesources =	$(EXTRA_libmysqld_a_SOURCES)
+storagesources = @condition_dependent_plugin_modules@
+storagesourceslinks = @condition_dependent_plugin_links@
 # automake misses these
 sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
@@ -170,12 +173,19 @@ link_sources:
 	      @LN_CP_F@ `find $(srcdir)/../sql -name "$$f"` "$$f"; \
 	    done; \
 	  fi; \
+	  if test -n "$(storagesources)" ; \
+	  then \
+	    rm -f $(storagesources); \
+	    for f in $(storagesourceslinks); do \
+	      @LN_CP_F@ $(top_srcdir)/$$f . ; \
+	    done; \
+	  fi; \
 	  rm -f client_settings.h; \
 	  @LN_CP_F@ $(top_srcdir)/libmysql/client_settings.h client_settings.h
 clean-local:
-	rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) | sed "s;\.lo;.c;g"` \
+	rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) $(storagesources) | sed "s;\.lo;.c;g"` \
 	       $(top_srcdir)/linked_libmysqld_sources; \
 	rm -f client_settings.h

--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -100,7 +100,6 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
  mysql->affected_rows= ~(my_ulonglong) 0;
  mysql->field_count= 0;
  net->last_errno= 0;
-  mysql->current_stmt= stmt;
  thd->store_globals();				// Fix if more than one connect
  /* 

--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -23,7 +23,6 @@ ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t
 #ndb_binlog_ignore_db     : BUG#21279 2006-07-25 ingo    Randomly throws a warning
 ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
-ps                       : BUG#21524 2006-08-08 pgalbraith 'ps' test fails in --ps-protocol test AMD64 bit
 ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open
 rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
 rpl_ndb_2myisam          : BUG#19227 Seems to pass currently

--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -15,8 +15,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 /* To avoid problems with alarms in debug code, we disable DBUG here */
-#undef DBUG_OFF
+#define FORCE_DBUG_OFF
-#define DBUG_OFF
 #include <my_global.h>
 #if defined(THREAD) && !defined(DONT_USE_THR_ALARM)

--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -72,7 +72,7 @@ multiple read locks.
 */
 #if !defined(MAIN) && !defined(DBUG_OFF) && !defined(EXTRA_DEBUG)
-#define DBUG_OFF
+#define FORCE_DBUG_OFF
 #endif
 #include "mysys_priv.h"

--- a/netware/BUILD/compile-AUTOTOOLS
+++ b/netware/BUILD/compile-AUTOTOOLS
@@ -5,8 +5,11 @@
 # stop on errors
 set -e
+sed -e "s/^DIST_COMMON/#DIST_COMMON/g" storage/ndb/Makefile.am > storage/ndb/Makefile.am.$$
+mv storage/ndb/Makefile.am.$$ storage/ndb/Makefile.am
-for package in . ./storage/innobase
+# for package in . ./storage/innobase
+for package in .
 do
 	(cd $package
 	rm -rf config.cache autom4te.cache
@@ -14,6 +17,7 @@ do
 	autoheader
 	libtoolize --force
 	aclocal
+#	automake --verbose --add-missing --force-missing
 	automake --add-missing --force-missing
 	autoconf)
 done

--- a/netware/BUILD/compile-netware-START
+++ b/netware/BUILD/compile-netware-START
@@ -24,5 +24,4 @@ base_configs=" \
 	--prefix=N:/mysql \
 	--without-mysqlmanager \
 	--without-man \
-	--without-csv-storage-engine \
 	"
--- a/netware/BUILD/mwenv
+++ b/netware/BUILD/mwenv
@@ -8,7 +8,7 @@ fi
 # The base path(in wineformat) where compilers, includes and
 # libraries are installed
-if test -z $MYDEV
+if test -z "$MYDEV"
 then
  # the default is "F:/mydev"
  export MYDEV="F:/mydev"

--- a/netware/BUILD/nwbootstrap
+++ b/netware/BUILD/nwbootstrap
@@ -151,17 +151,18 @@ echo "making files writable..."
 cd $target_dir
 chmod -R u+rw,g+rw .
-# edit the mvenv file
+## # edit the mvenv file
-echo "updating the mwenv environment file..."
+## echo "updating the mwenv environment file..."
 mwenv="./netware/BUILD/mwenv"
-mv -f $mwenv $mwenv.org
+## mv -f $mwenv $mwenv.org
-sed -e "s;WINE_BUILD_DIR;$wine_build_dir;g" \
+## sed -e "s;WINE_BUILD_DIR;$wine_build_dir;g" \
-	-e "s;BUILD_DIR;$build_dir;g" \
+## 	-e "s;BUILD_DIR;$build_dir;g" \
-  -e "s;VERSION;$version;g" $mwenv.org > $mwenv
+##   -e "s;VERSION;$version;g" $mwenv.org > $mwenv
-chmod +rwx $mwenv
+## chmod +rwx $mwenv
 PWD=`pwd`
-SRC_DIR=`grep "^export MYDEV=" $mwenv | cut -d'=' -f2 | \
+# This line will catch the default value only, let's hope it is correct
+SRC_DIR=`grep "^ *export MYDEV=" $mwenv | cut -d'=' -f2 | \
           sed -e 's;";;g' -e "s;^;echo ;g" -e "s;$;/\`basename $PWD\`;g" | /bin/sh`

--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -253,8 +253,8 @@ $CP mysql-test/t/*.test $BASE/mysql-test/t
 $CP mysql-test/t/*.imtest mysql-test/t/*.disabled $BASE/mysql-test/t
 $CP mysql-test/t/*.opt mysql-test/t/*.slave-mi $BASE/mysql-test/t
 $CP mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t
-$CP mysql-test/r/*.result mysql-test/r/*.require \
+$CP mysql-test/r/*.result  $BASE/mysql-test/r
-    $BASE/mysql-test/r
+$CP mysql-test/r/*.require $BASE/mysql-test/r
 $CP mysql-test/extra/binlog_tests/*.test $BASE/mysql-test/extra/binlog_tests
 $CP mysql-test/extra/rpl_tests/*.test $BASE/mysql-test/extra/rpl_tests
@@ -326,14 +326,16 @@ fi
 # NDB Cluster
 if [ x$NDBCLUSTER = x1 ]; then
-  ( cd storage/ndb    ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
+  ( cd storage/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
-  ( cd mysql-test/ndb ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
+  ( cd mysql-test  ; @MAKE@ DESTDIR=$BASE/ndb-stage install )
  $CP $BASE/ndb-stage@bindir@/* $BASE/bin/.
  $CP $BASE/ndb-stage@libexecdir@/* $BASE/bin/.
  $CP $BASE/ndb-stage@pkglibdir@/* $BASE/lib/.
  test -d $BASE/include/storage || mkdir $BASE/include/storage
  $CP -r $BASE/ndb-stage@pkgincludedir@/storage/ndb $BASE/include/storage/
  $CP -r $BASE/ndb-stage@prefix@/mysql-test/ndb $BASE/mysql-test/. || exit 1
+  $CP -r $BASE/ndb-stage@prefix@/mysql-test/std_data/ndb_backup50 $BASE/mysql-test/std_data/. || exit 1
+  $CP -r $BASE/ndb-stage@prefix@/mysql-test/std_data/ndb_backup51 $BASE/mysql-test/std_data/. || exit 1
  rm -rf $BASE/ndb-stage
 fi

--- a/scripts/make_win_bin_dist
+++ b/scripts/make_win_bin_dist
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -27,7 +27,7 @@ INCLUDES =		@ZLIB_INCLUDES@ \
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld
-EXTRA_PROGRAMS =	gen_lex_hash
+noinst_PROGRAMS =	gen_lex_hash
 bin_PROGRAMS =		mysql_tzinfo_to_sql
 gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
 LDADD =			$(top_builddir)/vio/libvio.a \
@@ -120,8 +120,9 @@ DEFS =			-DMYSQL_SERVER \
 			-DLIBDIR="\"$(MYSQLLIBdir)\"" \
 			@DEFS@
-BUILT_SOURCES =		sql_yacc.cc sql_yacc.h lex_hash.h
+BUILT_DIST_SRC =	sql_yacc.cc sql_yacc.h
-EXTRA_DIST =		udf_example.c udf_example.def $(BUILT_SOURCES) \
+BUILT_SOURCES =		$(BUILT_DIST_SRC) lex_hash.h
+EXTRA_DIST =		udf_example.c udf_example.def $(BUILT_DIST_SRC) \
 			nt_servc.cc nt_servc.h message.mc CMakeLists.txt \
 			udf_example.c udf_example.def
 CLEANFILES =        	lex_hash.h sql_yacc.cc sql_yacc.h sql_yacc.output
@@ -157,11 +158,10 @@ sql_yacc.o:	sql_yacc.cc sql_yacc.h $(HEADERS)
 		@echo "If it fails, re-run configure with --with-low-memory"
 		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
-# This generates lex_hash.h
+# FIXME seems like now "lex_hash.h" differs depending on configure
-# NOTE Built sources should depend on their sources not the tool
+# flags, so can't pregenerate and include in source TAR. Revert to
-# this avoid the rebuild of the built files in a source dist
+# dist pregenerated if this changes, so the file doesn't differ.
-lex_hash.h:	gen_lex_hash.cc lex.h
+lex_hash.h:	gen_lex_hash$(EXEEXT)
-		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
 		./gen_lex_hash$(EXEEXT) > $@
 # the following three should eventually be moved out of this directory

--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -7129,8 +7129,8 @@ int Update_rows_log_event::do_prepare_row(THD *thd, RELAY_LOG_INFO *rli,
                    row_start, &m_cols, row_end, &m_master_reclength,
                    table->write_set, UPDATE_ROWS_EVENT);
-  DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
+  DBUG_DUMP("record[0]", (const char *)table->record[0], table->s->reclength);
-  DBUG_DUMP("m_after_image", m_after_image, table->s->reclength);
+  DBUG_DUMP("m_after_image", (const char *)m_after_image, table->s->reclength);
  /*

--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -2632,10 +2632,10 @@ int THD::binlog_update_row(TABLE* table, bool is_trans,
  my_size_t const after_size= pack_row(table, cols, after_row, 
                                       after_record);
-  DBUG_DUMP("before_record", before_record, table->s->reclength);
+  DBUG_DUMP("before_record", (const char *)before_record, table->s->reclength);
-  DBUG_DUMP("after_record", after_record, table->s->reclength);
+  DBUG_DUMP("after_record", (const char *)after_record, table->s->reclength);
-  DBUG_DUMP("before_row", before_row, before_size);
+  DBUG_DUMP("before_row", (const char *)before_row, before_size);
-  DBUG_DUMP("after_row", after_row, after_size);
+  DBUG_DUMP("after_row", (const char *)after_row, after_size);
  Rows_log_event* const ev=
    binlog_prepare_pending_rows_event(table, server_id, cols, colcnt,

--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1421,6 +1421,7 @@ opt_ev_comment: /* empty */ { $$= 0; }
        | COMMENT_SYM TEXT_STRING_sys
          {
            Lex->comment= Lex->event_parse_data->comment= $2;
+            $$= 1;
          }
      ;

--- a/storage/federated/plug.in
+++ b/storage/federated/plug.in
@@ -2,3 +2,4 @@ MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],
        [Connects to tables on remote MySQL servers], [max,max-no-ndb])
 MYSQL_PLUGIN_STATIC(federated,    [libfederated.a])
 MYSQL_PLUGIN_DYNAMIC(federated,   [ha_federated.la])
+MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(federated, [ha_federated.cc])
--- a/storage/heap/plug.in
+++ b/storage/heap/plug.in
@@ -3,4 +3,5 @@ MYSQL_STORAGE_ENGINE(heap,no,   [Memory Storage Engine],
 MYSQL_PLUGIN_DIRECTORY(heap,    [storage/heap])
 MYSQL_PLUGIN_STATIC(heap,       [libheap.a])
 MYSQL_PLUGIN_MANDATORY(heap)    dnl Memory tables
+MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(heap, [ha_heap.cc])
--- a/storage/innobase/plug.in
+++ b/storage/innobase/plug.in
@@ -68,4 +68,5 @@ MYSQL_PLUGIN_ACTIONS(innobase,  [
      storage/innobase/handler/Makefile
      storage/innobase/usr/Makefile)
  ])
+MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(innobase, [handler/ha_innodb.cc])
--- a/storage/myisam/plug.in
+++ b/storage/myisam/plug.in
@@ -3,4 +3,5 @@ MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],
 MYSQL_PLUGIN_DIRECTORY(myisam,  [storage/myisam])
 MYSQL_PLUGIN_STATIC(myisam,     [libmyisam.a])
 MYSQL_PLUGIN_MANDATORY(myisam)  dnl Default
+MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(myisam, [ha_myisam.cc])
--- a/storage/myisammrg/plug.in
+++ b/storage/myisammrg/plug.in
@@ -3,3 +3,4 @@ MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine],
 MYSQL_PLUGIN_DIRECTORY(myisammrg,[storage/myisammrg])
 MYSQL_PLUGIN_STATIC(myisammrg,  [libmyisammrg.a])
 MYSQL_PLUGIN_MANDATORY(myisammrg)
+MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(myisammrg, [ha_myisammrg.cc])
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
@@ -75,7 +75,7 @@ Dbtup::dump_disk_alloc(Dbtup::Disk_alloc_info & alloc)
  for(Uint32 i = 0; i<MAX_FREE_LIST; i++)
  {
    printf("  %d : ", i);
-    Ptr<Page> ptr;
+    PagePtr ptr;
    ArrayPool<Page> *pool= (ArrayPool<Page>*)&m_global_page_pool;
    LocalDLList<Page> list(*pool, alloc.m_dirty_pages[i]);
    for(list.first(ptr); !ptr.isNull(); list.next(ptr))
@@ -262,7 +262,7 @@ Dbtup::update_extent_pos(Disk_alloc_info& alloc,
 }
 void
-Dbtup::restart_setup_page(Disk_alloc_info& alloc, Ptr<Page> pagePtr)
+Dbtup::restart_setup_page(Disk_alloc_info& alloc, PagePtr pagePtr)
 {
  /**
   * Link to extent, clear uncommitted_used_space
@@ -344,12 +344,15 @@ Dbtup::disk_page_prealloc(Signal* signal,
    if (!alloc.m_dirty_pages[i].isEmpty())
    {
      ptrI= alloc.m_dirty_pages[i].firstItem;
-      Ptr<GlobalPage> page;
+      Ptr<GlobalPage> gpage;
-      m_global_page_pool.getPtr(page, ptrI);
+      m_global_page_pool.getPtr(gpage, ptrI);
-      disk_page_prealloc_dirty_page(alloc, *(PagePtr*)&page, i, sz);
+      PagePtr tmp;
-      key->m_page_no= ((Page*)page.p)->m_page_no;
+      tmp.i = gpage.i;
-      key->m_file_no= ((Page*)page.p)->m_file_no;
+      tmp.p = reinterpret_cast<Page*>(gpage.p);
+      disk_page_prealloc_dirty_page(alloc, tmp, i, sz);
+      key->m_page_no= tmp.p->m_page_no;
+      key->m_file_no= tmp.p->m_file_no;
      if (DBG_DISK)
 	ndbout << " found dirty page " << *key << endl;
      return 0; // Page in memory
@@ -547,7 +550,7 @@ Dbtup::disk_page_prealloc(Signal* signal,
 void
 Dbtup::disk_page_prealloc_dirty_page(Disk_alloc_info & alloc,
-				     Ptr<Page> pagePtr, 
+				     PagePtr pagePtr, 
 				     Uint32 old_idx, Uint32 sz)
 {
  ddassert(pagePtr.p->list_index == old_idx);
@@ -638,7 +641,9 @@ Dbtup::disk_page_prealloc_callback(Signal* signal,
  fragPtr.i= req.p->m_frag_ptr_i;
  ptrCheckGuard(fragPtr, cnoOfFragrec, fragrecord);
-  Ptr<Page> pagePtr = *(Ptr<Page>*)&gpage;
+  PagePtr pagePtr;
+  pagePtr.i = gpage.i;
+  pagePtr.p = reinterpret_cast<Page*>(gpage.p);
  if (unlikely(pagePtr.p->m_restart_seq != globalData.m_restart_seq))
  {
@@ -666,7 +671,9 @@ Dbtup::disk_page_prealloc_initial_callback(Signal*signal,
  Ptr<GlobalPage> gpage;
  m_global_page_pool.getPtr(gpage, page_id);
-  Ptr<Page> pagePtr = *(Ptr<Page>*)&gpage;
+  PagePtr pagePtr;
+  pagePtr.i = gpage.i;
+  pagePtr.p = reinterpret_cast<Page*>(gpage.p);
  Ptr<Fragrecord> fragPtr;
  fragPtr.i= req.p->m_frag_ptr_i;
@@ -705,7 +712,7 @@ void
 Dbtup::disk_page_prealloc_callback_common(Signal* signal, 
 					  Ptr<Page_request> req, 
 					  Ptr<Fragrecord> fragPtr, 
-					  Ptr<Page> pagePtr)
+					  PagePtr pagePtr)
 {
  /**
   * 1) remove page request from Disk_alloc_info.m_page_requests
@@ -736,7 +743,7 @@ Dbtup::disk_page_prealloc_callback_common(Signal* signal,
   */
  ArrayPool<Page> *cheat_pool= (ArrayPool<Page>*)&m_global_page_pool;
  LocalDLList<Page> list(* cheat_pool, alloc.m_dirty_pages[new_idx]);
-  list.add(*(Ptr<Page>*)&pagePtr);
+  list.add(pagePtr);
  pagePtr.p->uncommitted_used_space = real_used;
  pagePtr.p->list_index = new_idx;
@@ -765,7 +772,7 @@ Dbtup::disk_page_prealloc_callback_common(Signal* signal,
 }
 void
-Dbtup::disk_page_set_dirty(Ptr<Page> pagePtr)
+Dbtup::disk_page_set_dirty(PagePtr pagePtr)
 {
  Uint32 idx = pagePtr.p->list_index;
  if ((idx & 0x8000) == 0)
@@ -833,7 +840,9 @@ Dbtup::disk_page_unmap_callback(Uint32 page_id, Uint32 dirty_count)
 {
  Ptr<GlobalPage> gpage;
  m_global_page_pool.getPtr(gpage, page_id);
-  PagePtr pagePtr= *(PagePtr*)&gpage;
+  PagePtr pagePtr;
+  pagePtr.i = gpage.i;
+  pagePtr.p = reinterpret_cast<Page*>(gpage.p);
  Uint32 type = pagePtr.p->m_page_header.m_page_type;
  if (unlikely((type != File_formats::PT_Tup_fixsize_page &&
@@ -1028,10 +1037,13 @@ Dbtup::disk_page_abort_prealloc(Signal *signal, Fragrecord* fragPtrP,
  case -1:
    break;
  default:
-    Ptr<GlobalPage> page;
+    Ptr<GlobalPage> gpage;
-    m_global_page_pool.getPtr(page, (Uint32)res);
+    m_global_page_pool.getPtr(gpage, (Uint32)res);
-    disk_page_abort_prealloc_callback_1(signal, fragPtrP, *(PagePtr*)&page, 
+    PagePtr pagePtr;
-					sz);
+    pagePtr.i = gpage.i;
+    pagePtr.p = reinterpret_cast<Page*>(gpage.p);
+    disk_page_abort_prealloc_callback_1(signal, fragPtrP, pagePtr, sz);
  }
 }
@@ -1044,8 +1056,10 @@ Dbtup::disk_page_abort_prealloc_callback(Signal* signal,
  Ptr<GlobalPage> gpage;
  m_global_page_pool.getPtr(gpage, page_id);
-  PagePtr pagePtr= *(PagePtr*)&gpage;
+  PagePtr pagePtr;
+  pagePtr.i = gpage.i;
+  pagePtr.p = reinterpret_cast<Page*>(gpage.p);
  Ptr<Tablerec> tabPtr;
  tabPtr.i= pagePtr.p->m_table_id;
  ptrCheckGuard(tabPtr, cnoOfTablerec, tablerec);
@@ -1308,7 +1322,9 @@ Dbtup::disk_restart_undo_callback(Signal* signal,
  jamEntry();
  Ptr<GlobalPage> gpage;
  m_global_page_pool.getPtr(gpage, page_id);
-  Ptr<Page> pagePtr = *(Ptr<Page>*)&gpage;
+  PagePtr pagePtr;
+  pagePtr.i = gpage.i;
+  pagePtr.p = reinterpret_cast<Page*>(gpage.p);
  Apply_undo* undo = &f_undo;

--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
@@ -1039,22 +1039,19 @@ int Dbtup::handleUpdateReq(Signal* signal,
  tup_version= (tup_version + 1) & ZTUP_VERSION_MASK;
  operPtrP->tupVersion= tup_version;
-  int retValue;
  if (!req_struct->interpreted_exec) {
    jam();
-    retValue= updateAttributes(req_struct,
+    int retValue = updateAttributes(req_struct,
-                               &cinBuffer[0],
+				    &cinBuffer[0],
-                               req_struct->attrinfo_len);
+				    req_struct->attrinfo_len);
+    if (unlikely(retValue == -1))
+      goto error;
  } else {
    jam();
    if (unlikely(interpreterStartLab(signal, req_struct) == -1))
      return -1;
  }
-  if (retValue == -1) {
-    goto error;
-  }
  if (regTabPtr->need_shrink())
  {  
    shrink_tuple(req_struct, sizes+2, regTabPtr, disk);
@@ -1073,7 +1070,7 @@ int Dbtup::handleUpdateReq(Signal* signal,
    jam();
    setChecksum(req_struct->m_tuple_ptr, regTabPtr);
  }
-  return retValue;
+  return 0;
 error:
  tupkeyErrorLab(signal);  

--- a/storage/ndb/src/kernel/vm/Pool.hpp
+++ b/storage/ndb/src/kernel/vm/Pool.hpp
@@ -305,7 +305,11 @@ inline
 bool
 RecordPool<T, P>::seize(Ptr<T> & ptr)
 {
-  return m_pool.seize(*(Ptr<void>*)&ptr);
+  Ptr<void> tmp;
+  bool ret = m_pool.seize(tmp);
+  ptr.i = tmp.i;
+  ptr.p = static_cast<T*>(tmp.p);
+  return ret;
 }
 template <typename T, typename P>

--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -327,7 +327,7 @@ then
  cp -fp mysql-debug-%{mysql_version}/config.log "$MYSQL_DEBUGCONFLOG_DEST"
 fi
-(cd mysql-debug-%{mysql_version} ; \
+(cd mysql-debug-%{mysql_version}/mysql-test ; \
 ./mysql-test-run.pl --comment=debug --skip-rpl --skip-ndbcluster --force ; \
 true)
@@ -357,12 +357,13 @@ then
  cp -fp  mysql-release-%{mysql_version}/config.log "$MYSQL_CONFLOG_DEST"
 fi
-(cd mysql-release-%{mysql_version} ; \
+cd mysql-release-%{mysql_version}/mysql-test
- ./mysql-test-run.pl --comment=normal --force ; \
+./mysql-test-run.pl --comment=normal --force --skip-ndbcluster --timer || true
- ./mysql-test-run.pl --comment=ps --ps-protocol --force ; \
+./mysql-test-run.pl --comment=ps --ps-protocol --force --skip-ndbcluster --timer || true
- ./mysql-test-run.pl --comment=normal+rowrepl --mysqld=--binlog-format=row --force ; \
+./mysql-test-run.pl --comment=normal+rowrepl --mysqld=--binlog-format=row --force --skip-ndbcluster --timer || true
- ./mysql-test-run.pl --comment=ps+rowrepl --ps-protocol --mysqld=--binlog-format=row --force ; \
+./mysql-test-run.pl --comment=ps+rowrepl+NDB --ps-protocol --mysqld=--binlog-format=row --force --timer || true
- true)
+./mysql-test-run.pl --comment=NDB --with-ndbcluster-only --force --timer || true
+cd ../..
 ##############################################################################
@@ -522,7 +523,6 @@ fi
 %doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1*
 %doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1*
 %doc %attr(644, root, man) %{_mandir}/man1/myisampack.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_explain_log.1*
 %doc %attr(644, root, man) %{_mandir}/man8/mysqld.8*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*
 %doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*

--- a/unittest/mytap/tap.c
+++ b/unittest/mytap/tap.c
@@ -140,11 +140,19 @@ static signal_entry install_signal[]= {
  { SIGABRT, handle_core_signal },
  { SIGFPE,  handle_core_signal },
  { SIGSEGV, handle_core_signal },
-  { SIGBUS,  handle_core_signal },
+  { SIGBUS,  handle_core_signal }
-  { SIGXCPU, handle_core_signal },
+#ifdef SIGXCPU
-  { SIGXFSZ, handle_core_signal },
+  , { SIGXCPU, handle_core_signal }
-  { SIGSYS,  handle_core_signal },
+#endif
-  { SIGTRAP, handle_core_signal }
+#ifdef SIGXCPU
+  , { SIGXFSZ, handle_core_signal }
+#endif
+#ifdef SIGXCPU
+  , { SIGSYS,  handle_core_signal }
+#endif
+#ifdef SIGXCPU
+  , { SIGTRAP, handle_core_signal }
+#endif
 };
 void