bk commit into 6.0 tree (vvaintroub:1.2776) BUG#32963

[Vladislav Vaintroub]

Below is the list of changes that have just been committed into a local
6.0 repository of . When  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, 2008-01-21 20:12:58+01:00, vvaintroub@vaio. +1 -0
  Bug#32963 - fixed regression, where test suite hangs during concurrent 
  TRUNCATE(falcon_bug_22173a)

  storage/falcon/ha_falcon.cpp@stripped, 2008-01-21 20:12:37+01:00, vvaintroub@vaio. +1 -1
    Let the server runtime synchroize TRUNCATE.

diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp	2008-01-09 20:24:21 +01:00
+++ b/storage/falcon/ha_falcon.cpp	2008-01-21 20:12:37 +01:00
@@ -830,7 +830,7 @@ THR_LOCK_DATA **StorageInterface::store_
 		if (    (lock_type >= TL_WRITE_CONCURRENT_INSERT && lock_type <=
TL_WRITE)
 		    && !(thd_in_lock_tables(thd) && sql_command == SQLCOM_LOCK_TABLES)
 		    && !(thd_tablespace_op(thd))
-		    &&  (sql_command != SQLCOM_TRUNCATE)
+		  //  &&  (sql_command != SQLCOM_TRUNCATE)
 		    &&  (sql_command != SQLCOM_OPTIMIZE)
 		    &&  (sql_command != SQLCOM_CREATE_TABLE)
 		   )