diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2006-09-27 15:42:00 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2006-09-27 15:42:00 +0500 |
| commit | 97ee72c5a0406b0eac0984084cbf45fe5646138f (patch) | |
| tree | a8dc7e7fb0a9a18ff444881790c98ae17c44202a /myisammrg | |
| parent | f7316a9eb86e580d7218fa34396150c87ebae910 (diff) | |
| parent | 30ffabad0436478ca3ea2aa20b9c0c3e9aa776ad (diff) | |
| download | mariadb-git-97ee72c5a0406b0eac0984084cbf45fe5646138f.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
myisammrg/myrg_open.c:
Auto merged
mysql-test/t/merge.test:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
Auto merged
mysql-test/r/repair.result:
Use local.
sql/table.cc:
Use local.
mysql-test/r/merge.result:
Manual merge
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; |