diff options
| author | svoj@mysql.com/april.(none) <> | 2006-09-27 15:42:00 +0500 |
|---|---|---|
| committer | svoj@mysql.com/april.(none) <> | 2006-09-27 15:42:00 +0500 |
| commit | bfb6ff6bddc1d5da9b64daec849d0ebd7e8d2198 (patch) | |
| tree | a8dc7e7fb0a9a18ff444881790c98ae17c44202a /myisammrg | |
| parent | c41bd4461b0a906892f4b35cac480784a08e27e2 (diff) | |
| parent | a324cb893490e4285a7ff75a322cbfac3d4850d2 (diff) | |
| download | mariadb-git-bfb6ff6bddc1d5da9b64daec849d0ebd7e8d2198.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
Diffstat (limited to 'myisammrg')
| -rw-r--r-- | myisammrg/myrg_open.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/myisammrg/myrg_open.c b/myisammrg/myrg_open.c index f9cdc2bb205..124d37904a6 100644 --- a/myisammrg/myrg_open.c +++ b/myisammrg/myrg_open.c @@ -89,7 +89,10 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) else fn_format(buff, buff, "", "", 0); if (!(isam=mi_open(buff,mode,(handle_locking?HA_OPEN_WAIT_IF_LOCKED:0)))) + { + my_errno= HA_ERR_WRONG_MRG_TABLE_DEF; goto err; + } if (!m_info) /* First file */ { key_parts=isam->s->base.key_parts; |