bk commit into 4.1 tree (tomas:1.2350) BUG#12055

[tomas]

Below is the list of changes that have just been committed into a local
4.1 repository of tomas. When tomas 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
  1.2350 05/07/20 18:40:55 tomas@stripped +1 -0
  Bug #12055  	NDB temp tables created by ALTER TABLE are usable
  - do not discover temporary files and make them visible

  sql/handler.cc
    1.170 05/07/20 18:40:47 tomas@stripped +2 -0
    Bug #12055  	NDB temp tables created by ALTER TABLE are usable
    - do not discover temporary files and make them visible

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-4.1

--- 1.169/sql/handler.cc	2005-06-27 19:30:53 +02:00
+++ 1.170/sql/handler.cc	2005-07-20 18:40:47 +02:00
@@ -1514,6 +1514,8 @@
   int error= -1; // Table does not exist in any handler
   DBUG_ENTER("ha_discover");
   DBUG_PRINT("enter", ("db: %s, name: %s", db, name));
+  if (is_prefix(name,tmp_file_prefix)) /* skip temporary tables */
+    DBUG_RETURN(error);
 #ifdef HAVE_NDBCLUSTER_DB
   if (have_ndbcluster == SHOW_OPTION_YES)
     error= ndbcluster_discover(thd, db, name, frmblob, frmlen);