bzr push into mysql-6.0 branch (serg:2746 to 2747)

[Sergei Golubchik]

 2747 Sergei Golubchik	2008-10-22 [merge]
      merged
modified:
  include/my_global.h
  unittest/mytap/tap.c

 2746 Michael Widenius	2008-10-22
      Fix for bug#39395 Maria: ma_extra.c:286: maria_extra: Assertion `share->reopen == 1' failed
added:
  mysql-test/suite/maria/r/maria-lock.result
  mysql-test/suite/maria/t/maria-lock.test
modified:
  sql/sql_base.cc
  storage/maria/ma_extra.c

=== modified file 'include/my_global.h'
--- a/include/my_global.h	2008-10-21 20:46:10 +0000
+++ b/include/my_global.h	2008-10-22 09:33:28 +0000
@@ -486,8 +486,7 @@ C_MODE_END
 #define compile_time_assert(X)                                  \
   do                                                            \
   {                                                             \
-    char compile_time_assert[(X) ? 1 : -1]                      \
-                             __attribute__ ((unused));          \
+    typedef char compile_time_assert[(X) ? 1 : -1];             \
   } while(0)
 #endif
 

=== modified file 'unittest/mytap/tap.c'
--- a/unittest/mytap/tap.c	2008-06-05 16:11:22 +0000
+++ b/unittest/mytap/tap.c	2008-10-22 09:33:28 +0000
@@ -178,7 +178,7 @@ static signal_entry install_signal[]= {
 #endif
 };
 
-int skip_big_tests= 0;
+int skip_big_tests= 1;
 
 void
 plan(int const count)