bk commit into 5.1 tree (serg:1.2497)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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 17:46:18-07:00, serg@stripped +4 -0
  compilation/test fixes

  include/my_global.h@stripped, 2007-04-29 17:46:10-07:00, serg@stripped +1 -1
    only use compile_time_assert on gcc

  mysql-test/mysql-test-run.pl@stripped, 2007-04-29 17:46:11-07:00, serg@stripped
+4 -1
    better --datadir for mysqld --help

  sql/mysql_priv.h@stripped, 2007-04-29 17:46:12-07:00, serg@stripped +2 -2
    error-prone but concatenation-friendly IF_NETWARE()

  storage/innobase/handler/ha_innodb.cc@stripped, 2007-04-29 17:46:12-07:00,
serg@stripped +1 -3
    no preprocessor directives inside 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:	serg
# Host:	sergbook.mysql.com
# Root:	/usr/home/serg/Abk/mysql-5.1-wl2936

--- 1.502/sql/mysql_priv.h	2007-04-29 17:46:29 -07:00
+++ 1.503/sql/mysql_priv.h	2007-04-29 17:46:29 -07:00
@@ -259,9 +259,9 @@
 #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.298/mysql-test/mysql-test-run.pl	2007-04-29 17:46:29 -07:00
+++ 1.299/mysql-test/mysql-test-run.pl	2007-04-29 17:46:29 -07:00
@@ -1361,7 +1361,10 @@
   # --no-defaults and --skip-grant-tables are to avoid loading
   # system-wide configs and plugins
   #
-  my $list= `$exe_mysqld --no-defaults --datadir=$default_vardir
--language=$path_language --skip-grant-tables --verbose --help`;
+  # --datadir - for lowercase test to work
+  #
+  my $tmp_datadir=$opt_vardir || $default_vardir;
+  my $list= `$exe_mysqld --no-defaults --datadir=$tmp_datadir --language=$path_language
--skip-grant-tables --verbose --help`;
 
   foreach my $line (split('\n', $list))
   {

--- 1.335/storage/innobase/handler/ha_innodb.cc	2007-04-29 17:46:29 -07:00
+++ 1.336/storage/innobase/handler/ha_innodb.cc	2007-04-29 17:46:29 -07:00
@@ -7675,9 +7675,7 @@
     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);
 

--- 1.166/include/my_global.h	2007-04-29 17:46:29 -07:00
+++ 1.167/include/my_global.h	2007-04-29 17:46:29 -07:00
@@ -466,7 +466,7 @@
 #include <assert.h>
 
 /* an assert that works at compile-time. only for constant expression */
-#ifdef __WIN__
+#ifndef __GNUC__
 #define compile_time_assert(X)  do { } while(0)
 #else
 #define compile_time_assert(X)                                  \