diff options
| author | unknown <ndbdev@dl145b.mysql.com> | 2005-07-21 08:06:26 +0200 |
|---|---|---|
| committer | unknown <ndbdev@dl145b.mysql.com> | 2005-07-21 08:06:26 +0200 |
| commit | b28ccd1bb2433165de2a7fed84e074a27564d0a5 (patch) | |
| tree | 851e7a27150c2c908264d4209aaca598cfe977cf /sql/handler.cc | |
| parent | 68c558ee5f4dc31f7d0b2a30eba0e30bd61cba02 (diff) | |
| parent | 2940168feb06b37d3a4ee677144274a9892bb270 (diff) | |
| download | mariadb-git-b28ccd1bb2433165de2a7fed84e074a27564d0a5.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
sql/handler.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisam/rt_split.c:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index c2a138e7013..89883d038d6 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2268,6 +2268,8 @@ int ha_discover(THD *thd, const char *db, const char *name, 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); |