diff options
| author | unknown <pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2005-07-21 01:29:57 -0400 |
|---|---|---|
| committer | unknown <pappa@c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2005-07-21 01:29:57 -0400 |
| commit | 0b732c47973622384b97caccb9703b9bd5a4a93e (patch) | |
| tree | f28d036bdc60c31c38b1d066b2d9e02fa4e980e6 /sql/handler.cc | |
| parent | 1ef3c69685de83a28ce44588f70df808c16df1ce (diff) | |
| parent | 31ebc6ef71afaf4605ab5d00ddaf8d548683212d (diff) | |
| download | mariadb-git-0b732c47973622384b97caccb9703b9bd5a4a93e.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
include/my_sys.h:
Auto merged
include/thr_lock.h:
Auto merged
sql/handler.cc:
Auto merged
sql-common/client.c:
Auto merged
client/mysqldump.c:
Manual merge
include/mysql.h:
Manual merge
libmysql/libmysql.c:
Manual merge
myisam/rt_split.c:
Manual merge
mysys/thr_lock.c:
Manual merge
sql/lock.cc:
Manual merge
sql/mysql_priv.h:
Manual merge
sql/sql_base.cc:
Manual merge
sql/sql_table.cc:
Manual merge
tests/mysql_client_test.c:
Manual merge
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 0d0f9a75e52..2731cb8480d 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2101,6 +2101,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); |