bk commit into 5.1 tree (df:1.2413) BUG#14420

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.1 repository of df. When df 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@stripped, 2007-01-27 22:07:52+01:00, df@stripped +2 -0
  Build fix for sunfire100b. This can go when BUG#14420 is fixed.

  dbug/dbug.c@stripped, 2007-01-27 22:07:50+01:00, df@stripped +14 -0
    Build fix for sunfire100b. The ld does not want to link with an empty library, so we
put something in it.

  dbug/factorial.c@stripped, 2007-01-27 22:07:50+01:00, df@stripped +12 -2
    Build fix for sunfire100b. When DBUG_OFF is defined, dbug is not there, and we can't
use it even if we try, period.

# 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:	df
# Host:	kahlann.erinye.com
# Root:	/home/df/mysql/build/mysql-5.1.15-release

--- 1.33/dbug/dbug.c	2006-11-29 21:50:56 +01:00
+++ 1.34/dbug/dbug.c	2007-01-27 22:07:50 +01:00
@@ -2375,4 +2375,18 @@ va_list ap;
 
 #endif  /* NO_VARARGS */
 
+#else
+
+/*
+ * Dummy function, workaround for MySQL bug#14420 related
+ * build failure on a platform where linking with an empty
+ * archive fails.
+ *
+ * This block can be removed as soon as a fix for bug#14420
+ * is implemented.
+ */
+int i_am_a_dummy_function() {
+       return 0;
+}
+
 #endif

--- 1.4/dbug/factorial.c	2001-09-14 01:54:30 +02:00
+++ 1.5/dbug/factorial.c	2007-01-27 22:07:50 +01:00
@@ -1,6 +1,13 @@
 #ifdef DBUG_OFF				/* We are testing dbug */
-#undef DBUG_OFF
-#endif
+
+int factorial(register int value) {
+	if(value > 1) {
+		value *= factorial(value-1);
+	}
+	return value;
+}
+
+#else
 
 #include <my_global.h>
 
@@ -15,3 +22,6 @@ register int value)
     DBUG_PRINT ("result", ("result is %d", value));
     DBUG_RETURN (value);
 }
+
+#endif
+