bzr commit into mysql-6.0-bugteam branch (svoj:2971)

[Sergey Vojtovich]

#At file:///home/svoj/devel/bzr-mysql/mysql-6.0-bugteam-push/

 2971 Sergey Vojtovich	2009-01-21 [merge]
      Merge.
modified:
  mysql-test/suite/parts/t/disabled.def
  storage/falcon/ha_falcon.cpp

=== modified file 'mysql-test/suite/parts/t/disabled.def'
--- a/mysql-test/suite/parts/t/disabled.def	2009-01-19 13:16:25 +0000
+++ b/mysql-test/suite/parts/t/disabled.def	2009-01-20 14:42:38 +0000
@@ -7,4 +7,3 @@ partition_mgm_lc0_ndb          : Bug#387
 partition_mgm_lc1_ndb          : Bug#38778 - master1 crashes
 partition_mgm_lc2_ndb          : Bug#38778 - master1 crashes
 partition_auto_increment_ndb   : Bug#39773 - auto_increment for NDB changed behavior
-partition_auto_increment_falcon : Bug #42079 - Falcon does not reset auto_increment on transactional truncate

=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp	2008-12-11 17:29:35 +0000
+++ b/storage/falcon/ha_falcon.cpp	2009-01-20 14:42:38 +0000
@@ -1062,8 +1062,7 @@ int StorageInterface::delete_all_rows()
 
 	// If this isn't a truncate, punt!
 	
-//	if (thd_sql_command(mySqlThread) != SQLCOM_TRUNCATE)
-	if (current_thd->transaction.on)
+	if (thd_sql_command(mySqlThread) != SQLCOM_TRUNCATE)
 		DBUG_RETURN(my_errno=HA_ERR_WRONG_COMMAND);
 
 	int ret = 0;