summaryrefslogtreecommitdiff
path: root/myisam/mi_rnext_same.c
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-11-04 14:09:03 +0200
committerunknown <monty@narttu.mysql.fi>2003-11-04 14:09:03 +0200
commit0712ce9ec5d3b84acfcb33ebe8b653ed6e0f084c (patch)
tree07ce6a4f792ac489b079759afb3cc65847ca0cb0 /myisam/mi_rnext_same.c
parentf97f48acaf26aebc3f79de34b21607e11e1b91fa (diff)
downloadmariadb-git-0712ce9ec5d3b84acfcb33ebe8b653ed6e0f084c.tar.gz
Removed some warnings reported by valgrind
After merge fixes. Now code compiles, but there is still some valgrind warnings that needs to be fixed myisam/mi_rnext_same.c: handle case where rtree_find_next() returns an error (assume this means that there was no more keys) myisam/rt_index.c: Code cleanup mysql-test/r/func_crypt.result: Update results mysql-test/r/func_group.result: Update results mysql-test/r/null_key.result: Update results mysql-test/r/order_by.result: Update results mysql-test/r/query_cache.result: Update results mysql-test/r/range.result: Update results mysql-test/r/rpl_trunc_binlog.result: Update results mysql-test/t/fulltext.test: Fix error numbers mysql-test/t/func_crypt.test: Fixed test for 4.1 mysql-test/t/range.test: Moved tests to be in sync with 4.0 mysys/test_charset.c: Removed acccess to non existing functions sql-common/client.c: Merge fix sql/item_strfunc.cc: Simple code cleanup Don't call ->c_ptr() when you don't need a 0 terminated string (Causes warnings from valgrind) sql/log_event.cc: After merge fixes sql/protocol.cc: Change default catalog name to 'def' sql/spatial.cc: Code cleanup sql/sql_class.cc: After merge fixes sql/time.cc: Ensure that time object is cleared on error sql/unireg.cc: Removed warning reported by valgrind
Diffstat (limited to 'myisam/mi_rnext_same.c')
-rw-r--r--myisam/mi_rnext_same.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/myisam/mi_rnext_same.c b/myisam/mi_rnext_same.c
index 200e715bddc..19190a60246 100644
--- a/myisam/mi_rnext_same.c
+++ b/myisam/mi_rnext_same.c
@@ -41,17 +41,20 @@ int mi_rnext_same(MI_INFO *info, byte *buf)
if (info->s->concurrent_insert)
rw_rdlock(&info->s->key_root_lock[inx]);
- switch(keyinfo->key_alg)
+ switch (keyinfo->key_alg)
{
case HA_KEY_ALG_RTREE:
- if((error=rtree_find_next(info,inx,myisam_read_vec[info->last_key_func])))
- {
- /* FIXME: What to do?*/
- }
+ if ((error=rtree_find_next(info,inx,
+ myisam_read_vec[info->last_key_func])))
+ {
+ error=1;
+ my_errno=HA_ERR_END_OF_FILE;
+ info->lastpos= HA_OFFSET_ERROR;
+ break;
+ }
break;
case HA_KEY_ALG_BTREE:
default:
-
memcpy(info->lastkey2,info->lastkey,info->last_rkey_length);
for (;;)
{