bk commit into 5.1 tree (antony:1.2495)

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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-04-29 09:10:10-07:00, antony@stripped +2 -0
  fix build errors
    some compilers do not permit directives with macro arguments

  sql/mysql_priv.h@stripped, 2007-04-29 09:10:06-07:00, antony@stripped +2 -2
    Remove parentheses on IF_NETWARE() macro

  storage/innobase/handler/ha_innodb.cc@stripped, 2007-04-29 09:10:06-07:00, antony@stripped +1 -4
    fix build errors
      some compilers do not permit directives with macro arguments

# 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:	antony
# Host:	ppcg5.local
# Root:	/Users/antony/Work/fixme

--- 1.502/sql/mysql_priv.h	2007-04-29 09:10:19 -07:00
+++ 1.503/sql/mysql_priv.h	2007-04-29 09:10:19 -07:00
@@ -259,9 +259,9 @@ MY_LOCALE *my_locale_by_number(uint numb
 #define MAX_CONNECT_ERRORS	10		// errors before disabling host
 
 #ifdef __NETWARE__
-#define IF_NETWARE(A,B) (A)
+#define IF_NETWARE(A,B) A
 #else
-#define IF_NETWARE(A,B) (B)
+#define IF_NETWARE(A,B) B
 #endif
 
 #if defined(__WIN__)

--- 1.334/storage/innobase/handler/ha_innodb.cc	2007-04-29 09:10:20 -07:00
+++ 1.335/storage/innobase/handler/ha_innodb.cc	2007-04-29 09:10:20 -07:00
@@ -7675,10 +7675,7 @@ static MYSQL_SYSVAR_ULONG(fast_shutdown,
     NetWare can't close unclosed files, can't automatically kill remaining
     threads, etc, so on this OS we disable the crash-like InnoDB shutdown.
   */
-#ifndef __NETWARE__
-  " or 2 (fastest - crash-like)"
-#endif
-  ".",
+  IF_NETWARE(".", " or 2 (fastest - crash-like)."),
   NULL, NULL, 1, 0, IF_NETWARE(1,2), 0);
 
 static MYSQL_SYSVAR_BOOL(file_per_table, innobase_file_per_table,