summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorkostja@bodhi.(none) <>2008-05-20 11:38:17 +0400
committerkostja@bodhi.(none) <>2008-05-20 11:38:17 +0400
commit2c0ce2a832be070b27d88a4815e1c555a8f4e8f5 (patch)
treec2c65314fdd8ac05f82de10701ce5eb6a9856e11 /storage
parent7ec38d1fa724192f19f13dc35073a0952ff9f7d4 (diff)
parent86396459aed8c3c72ee2db921dc4f5f79dde3aec (diff)
downloadmariadb-git-2c0ce2a832be070b27d88a4815e1c555a8f4e8f5.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into bodhi.(none):/opt/local/work/mysql-5.1-27430
Diffstat (limited to 'storage')
-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;
}