diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2006-09-28 22:14:31 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2006-09-28 22:14:31 +0500 |
| commit | d96989ca654fccc92a4620deca5f709fd84ec3f8 (patch) | |
| tree | 3e256610af9a7c207c8d7350ed947a8cca5670fe /myisammrg/myrg_queue.c | |
| parent | 1f9b959166f835165ef1c2d2bb499389a1a793fc (diff) | |
| parent | 7d915f01934d73cf2500618fc7f5148768cfd1b8 (diff) | |
| download | mariadb-git-d96989ca654fccc92a4620deca5f709fd84ec3f8.tar.gz | |
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
myisammrg/myrg_open.c:
Auto merged
mysql-test/r/merge.result:
Manual merge.
mysql-test/t/merge.test:
Manual merge.
Diffstat (limited to 'myisammrg/myrg_queue.c')
| -rw-r--r-- | myisammrg/myrg_queue.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/myisammrg/myrg_queue.c b/myisammrg/myrg_queue.c index 7172b9f0e2a..bf99e8434a6 100644 --- a/myisammrg/myrg_queue.c +++ b/myisammrg/myrg_queue.c @@ -51,6 +51,8 @@ int _myrg_init_queue(MYRG_INFO *info,int inx,enum ha_rkey_function search_flag) error=my_errno; } } + else + my_errno= error= HA_ERR_WRONG_INDEX; return error; } |