bzr push into mysql-6.0 branch (alik:2680 to 2681)

[Alexander Nozdrin]

 2681 Alexander Nozdrin	2008-08-28
      Fix test case sporadic failures.
modified:
  mysql-test/include/wait_for_slave_sql_error_and_skip.inc
  mysql-test/t/events_grant.test

 2680 Alexander Nozdrin	2008-08-28 [merge]
      Pull from mysql-6.0
modified:
  configure.in
  libmysql/CMakeLists.txt
  mysql-test/include/have_falcon.inc
  mysql-test/suite/falcon/r/falcon_bug_22165.result
  mysql-test/suite/falcon/t/falcon_bug_22165.test
  storage/falcon/BackLog.cpp
  storage/falcon/CMakeLists.txt
  storage/falcon/Configuration.cpp
  storage/falcon/IO.cpp
  storage/falcon/Index.cpp
  storage/falcon/Index2RootPage.cpp
  storage/falcon/IndexRootPage.cpp
  storage/falcon/Interlock.h
  storage/falcon/MemMgr.cpp
  storage/falcon/RepositoryVolume.cpp
  storage/falcon/Statement.cpp
  storage/falcon/StorageDatabase.cpp
  storage/falcon/StorageDatabase.h
  storage/falcon/StorageTable.cpp
  storage/falcon/StorageTable.h
  storage/falcon/StorageTableShare.cpp
  storage/falcon/StorageTableShare.h
  storage/falcon/Table.cpp
  storage/falcon/Table.h
  storage/falcon/TableSpace.cpp
  storage/falcon/Transaction.cpp
  storage/falcon/Transaction.h
  storage/falcon/TransactionManager.cpp
  storage/falcon/ha_falcon.cpp
  storage/falcon/ha_falcon.h
  storage/falcon/plug.in
  storage/maria/CMakeLists.txt

=== modified file 'mysql-test/include/wait_for_slave_sql_error_and_skip.inc'
--- a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc	2008-08-26 12:29:33 +0000
+++ b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc	2008-08-28 10:40:34 +0000
@@ -17,6 +17,9 @@ if ($show_sql_error)
   echo Last_SQL_Error = $error;
 }
 
+# wait for SQL thread to stop after the error
+source include/wait_for_slave_sql_to_stop.inc;
+
 # skip the erroneous statement
 set global sql_slave_skip_counter=1;
 start slave;

=== modified file 'mysql-test/t/events_grant.test'
--- a/mysql-test/t/events_grant.test	2007-05-26 14:36:38 +0000
+++ b/mysql-test/t/events_grant.test	2008-08-28 10:40:34 +0000
@@ -1,7 +1,9 @@
 # Can't test with embedded server that doesn't support grants
 -- source include/not_embedded.inc
 
+--disable_warnings
 CREATE DATABASE IF NOT EXISTS events_test;
+--enabled_warnings
 use events_test;
 #
 # Events grants test begin