bk commit into 5.0 tree (marko:1.1877)

[Marko Mäkelä]

Below is the list of changes that have just been committed into a local
5.0 repository of marko. When marko does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1877 05/06/16 15:00:25 marko@stripped +3 -0
  InnoDB: Fix ut0dbg compilation errors on NetWare

  innobase/ut/ut0dbg.c
    1.10 05/06/16 15:00:17 marko@stripped +15 -1
    [__NETWARE__] Add function ut_dbg_panic()

  innobase/include/ut0dbg.h
    1.18 05/06/16 15:00:17 marko@stripped +2 -6
    UT_DBG_PANIC: Avoid exit(), as lexyy.c re-#defines exit().
    Move the code to the function ut_dbg_panic() instead.

  innobase/dict/dict0boot.c
    1.14 05/06/16 15:00:17 marko@stripped +0 -9
    Remove dummy code to work around bug in the pgcc compiler.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	marko
# Host:	hundin.mysql.fi
# Root:	/home/marko/mysql-5.0

--- 1.13/innobase/dict/dict0boot.c	Fri Jan 14 13:54:14 2005
+++ 1.14/innobase/dict/dict0boot.c	Thu Jun 16 15:00:17 2005
@@ -66,15 +66,6 @@
 	dict_hdr = dict_hdr_get(&mtr);
 
 	id = mtr_read_dulint(dict_hdr + type, &mtr); 
-
-	/* Add some dummy code here because otherwise pgcc seems to
-	compile wrong */
-
-	if (0 == ut_dulint_cmp(id, ut_dulint_max)) {
-		/* TO DO: remove this code, or make it conditional */
-		ut_dbg_null_ptr = 0;
-	}
-
 	id = ut_dulint_add(id, 1);
 	
 	mlog_write_dulint(dict_hdr + type, id, &mtr); 

--- 1.17/innobase/include/ut0dbg.h	Fri Jun 10 12:22:15 2005
+++ 1.18/innobase/include/ut0dbg.h	Thu Jun 16 15:00:17 2005
@@ -36,12 +36,8 @@
 On NetWare, have a graceful exit rather than a segfault to avoid abends. */
 extern ibool	panic_shutdown;
 /* Abort the execution. */
-# define UT_DBG_PANIC				\
-	if (!panic_shutdown){			\
-		panic_shutdown = TRUE;		\
-		innobase_shutdown_for_mysql();	\
-	}					\
-	exit(1)
+void ut_dbg_panic(void);
+# define UT_DBG_PANIC ut_dbg_panic()
 /* Stop threads in ut_a(). */
 # define UT_DBG_STOP	while (0)	/* We do not do this on NetWare */
 #else /* __NETWARE__ */

--- 1.9/innobase/ut/ut0dbg.c	Fri Jun 10 12:22:15 2005
+++ 1.10/innobase/ut/ut0dbg.c	Thu Jun 16 15:00:17 2005
@@ -59,7 +59,21 @@
 	ut_dbg_stop_threads = TRUE;
 }
 
-#ifndef __NETWARE__
+#ifdef __NETWARE__
+/*****************************************************************
+Shut down MySQL/InnoDB after assertion failure. */
+
+void
+ut_dbg_panic(void)
+/*==============*/
+{
+	if (!panic_shutdown) {
+		panic_shutdown = TRUE;
+		innobase_shutdown_for_mysql();
+	}
+	exit(1);
+}
+#else /* __NETWARE__ */
 /*****************************************************************
 Stop a thread after assertion failure. */