summaryrefslogtreecommitdiff
path: root/storage/myisammrg/myrg_queue.c
diff options
context:
space:
mode:
authorsvoj@april.(none) <>2006-09-29 00:23:43 +0500
committersvoj@april.(none) <>2006-09-29 00:23:43 +0500
commit7ed413d17b717fc91c5b23f81a482de3e1693929 (patch)
tree6ddce11f9510e4862cf11cfc2d279b535e208f76 /storage/myisammrg/myrg_queue.c
parentf1b3b1628f34c04d00c32055ae5d42c80f115467 (diff)
parentad7da7f1de71afbd189d36c301d4ae077fc774ab (diff)
downloadmariadb-git-7ed413d17b717fc91c5b23f81a482de3e1693929.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
Diffstat (limited to 'storage/myisammrg/myrg_queue.c')
-rw-r--r--storage/myisammrg/myrg_queue.c2
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;
}