summaryrefslogtreecommitdiff
path: root/storage/myisam
diff options
context:
space:
mode:
authorthek@kpdesk.mysql.com <>2008-04-14 12:58:53 +0200
committerthek@kpdesk.mysql.com <>2008-04-14 12:58:53 +0200
commitf932e51b454109e3121918d314193b1cbbd2ff2c (patch)
tree5a0c042d9ace20eab8942b19314ec930c62a10a5 /storage/myisam
parent013fd236755ec402a988eaa70392e0a08c169ac0 (diff)
parente4d011c60394c07bd31d772fe591c4bf8ab5f7b4 (diff)
downloadmariadb-git-f932e51b454109e3121918d314193b1cbbd2ff2c.tar.gz
Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1
into kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1-merge
Diffstat (limited to 'storage/myisam')
-rw-r--r--storage/myisam/mi_create.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/myisam/mi_create.c b/storage/myisam/mi_create.c
index bc4dcf0bdbb..2784861f48a 100644
--- a/storage/myisam/mi_create.c
+++ b/storage/myisam/mi_create.c
@@ -634,6 +634,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
my_printf_error(0, "MyISAM table '%s' is in use "
"(most likely by a MERGE table). Try FLUSH TABLES.",
MYF(0), name + dirname_length(name));
+ my_errno= HA_ERR_TABLE_EXIST;
goto err;
}