diff --git a/include/my_global.h b/include/my_global.h
index 7775f19530e..5a6567371d0 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -466,7 +466,7 @@ C_MODE_END
 #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)                                  \
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 413da029acc..1096123bf47 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1361,7 +1361,10 @@ sub collect_mysqld_features () {
   # --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))
   {
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index b08b7913085..b6b4cc45f80 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -259,9 +259,9 @@ MY_LOCALE *my_locale_by_number(uint number);
 #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__)
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 5917f807c5a..a81cb748ce8 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -7675,9 +7675,7 @@ static MYSQL_SYSVAR_ULONG(fast_shutdown, innobase_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);