diff options
| author | unknown <svoj@april.(none)> | 2006-09-29 00:23:43 +0500 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-09-29 00:23:43 +0500 |
| commit | 70c6f7d2276d34b5890f074a22b6a9f3a7c9579d (patch) | |
| tree | 6ddce11f9510e4862cf11cfc2d279b535e208f76 /storage/myisammrg/myrg_queue.c | |
| parent | 0d7fdc9ee306a2aadfa9b676ce421ead182f90dd (diff) | |
| parent | 59a7f1ab5fe51755413eb75335a8bfd82975acb1 (diff) | |
| download | mariadb-git-70c6f7d2276d34b5890f074a22b6a9f3a7c9579d.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.1-engines
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysys/queues.c:
Auto merged
storage/myisammrg/myrg_open.c:
Auto merged
storage/myisammrg/myrg_queue.c:
Auto merged
Diffstat (limited to 'storage/myisammrg/myrg_queue.c')
| -rw-r--r-- | storage/myisammrg/myrg_queue.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/myisammrg/myrg_queue.c b/storage/myisammrg/myrg_queue.c index 2e600a526c0..74fdddc7748 100644 --- a/storage/myisammrg/myrg_queue.c +++ b/storage/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; } |