summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorunknown <gni/root@dev3-221.dev.cn.tlan>2007-04-04 14:30:12 +0800
committerunknown <gni/root@dev3-221.dev.cn.tlan>2007-04-04 14:30:12 +0800
commit5ca5d5dee2882ad620feac37c06f291a871cacca (patch)
treefb820a26e45ca384fbe3ca39a8f6ccb296226ad4 /sql/handler.cc
parentb263f63b26ea0cb4131c683bed733d238c5c619c (diff)
parent5203ea6ccb349aae5e53e3f0247256a9fc60208e (diff)
downloadmariadb-git-5ca5d5dee2882ad620feac37c06f291a871cacca.tar.gz
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug18676
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676 mysql-test/r/ndb_autodiscover.result: Auto merged sql/handler.cc: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.cpp: Auto merged storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged sql/ha_ndbcluster.cc: merge 5.0-ndb-bj for bug#18676 into 5.1-ndb-bj sql/sql_table.cc: merge 5.0-ndb-bj for bug#18676 into 5.1-ndb-bj
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 23c3103493e..751b324165d 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -2865,9 +2865,9 @@ ha_find_files(THD *thd,const char *db,const char *path,
Ask handler if the table exists in engine
RETURN
- 0 Table does not exist
- 1 Table exists
- # Error code
+ HA_ERR_NO_SUCH_TABLE Table does not exist
+ HA_ERR_TABLE_EXIST Table exists
+ # Error code
*/
struct st_table_exists_in_engine_args
@@ -2891,7 +2891,7 @@ static my_bool table_exists_in_engine_handlerton(THD *thd, st_plugin_int *plugin
int ha_table_exists_in_engine(THD* thd, const char* db, const char* name)
{
- int error= 0;
+ int error= HA_ERR_NO_SUCH_TABLE;
DBUG_ENTER("ha_table_exists_in_engine");
DBUG_PRINT("enter", ("db: %s, name: %s", db, name));
st_table_exists_in_engine_args args= {db, name};