diff options
| author | unknown <svoj@april.(none)> | 2006-09-27 18:58:23 +0500 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-09-27 18:58:23 +0500 |
| commit | d119810cca8bdddc9ed7bef17c2742f6bf512f23 (patch) | |
| tree | e80bfc86692affe997adce61f718b7b13026f001 /storage | |
| parent | ffa4a1e05ae6ecb2951bfdd117bf6df404834f7c (diff) | |
| parent | d6d1176eed9f249107410bc981f931dac81757ca (diff) | |
| download | mariadb-git-d119810cca8bdddc9ed7bef17c2742f6bf512f23.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
mysql-test/r/repair.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/table.cc:
Auto merged
storage/myisammrg/myrg_open.c:
Auto merged
mysql-test/r/merge.result:
Manual merge.
sql/share/errmsg.txt:
Manual merge.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisammrg/myrg_open.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/storage/myisammrg/myrg_open.c b/storage/myisammrg/myrg_open.c index cf82f13da57..862201ed841 100644 --- a/storage/myisammrg/myrg_open.c +++ b/storage/myisammrg/myrg_open.c @@ -90,7 +90,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; |