diff options
| author | unknown <thek@kpdesk.mysql.com> | 2008-04-14 12:58:53 +0200 |
|---|---|---|
| committer | unknown <thek@kpdesk.mysql.com> | 2008-04-14 12:58:53 +0200 |
| commit | 7378628456033fa7406be8699a0e1e0c7bbda3da (patch) | |
| tree | 5a0c042d9ace20eab8942b19314ec930c62a10a5 /storage | |
| parent | c481f6b3cf80f471321d2ef4e7c68fe9e6e5d0ca (diff) | |
| parent | f149152f9778ba529c8999ed1175321b1ecbea88 (diff) | |
| download | mariadb-git-7378628456033fa7406be8699a0e1e0c7bbda3da.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
mysql-test/r/grant.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/mi_create.c | 1 |
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; } |