bk commit into 6.0 tree (hakank:1.2630) BUG#31465

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakan. When hakan 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, 2007-10-10 07:43:48+02:00, hakank@lu0011.(none) +1 -0
  Fix for Bug#31465 by Kevin.

  storage/falcon/ha_falcon.cpp@stripped, 2007-10-10 07:43:44+02:00, hakank@lu0011.(none) +6 -2
    Fix for Bug#31465 by Kevin.

diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp	2007-10-09 17:49:34 +02:00
+++ b/storage/falcon/ha_falcon.cpp	2007-10-10 07:43:44 +02:00
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 MySQL AB
+/* Copyright (C) 2006, 2007 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -843,7 +843,11 @@ int StorageInterface::delete_table(const
 	storageTable->deleteStorageTable();
 	storageTable = NULL;
 
-	if (res == StorageErrorTableNotFound)
+	// (hk) Fix for Bug#31465 Running Falcon test suite leads
+	//                        to warnings about temp tables
+	// This fix could affect other DROP TABLE scenarios.
+	// if (res == StorageErrorTableNotFound)
+	if (res != StorageErrorUncommittedUpdates)
 		res = 0;
 
 	DBUG_RETURN(error(res));