diff options
| author | unknown <svoj@mysql.com/april.(none)> | 2006-09-29 00:00:27 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com/april.(none)> | 2006-09-29 00:00:27 +0500 |
| commit | 59a7f1ab5fe51755413eb75335a8bfd82975acb1 (patch) | |
| tree | cb0da6feddaf396d3f2c2ed866624773c0d25da6 /myisammrg/myrg_queue.c | |
| parent | 9902c35a45ca3bdc391873c3e2914097870a6e3a (diff) | |
| parent | d96989ca654fccc92a4620deca5f709fd84ec3f8 (diff) | |
| download | mariadb-git-59a7f1ab5fe51755413eb75335a8bfd82975acb1.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
myisammrg/myrg_open.c:
Auto merged
myisammrg/myrg_queue.c:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/r/merge.result:
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 2e600a526c0..74fdddc7748 100644 --- a/myisammrg/myrg_queue.c +++ b/myisammrg/myrg_queue.c @@ -65,6 +65,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; } |