Commit 66e1777a authored by paul@teton.kitebird.com's avatar paul@teton.kitebird.com

Merge paul@work.mysql.com:/home/bk/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0
parents 82dc93b5 3bd8dba6
No related merge requests found
......@@ -23,8 +23,7 @@ MYRG_INFO *info,
const byte *record)
{
if (!info->current_table)
{
return(my_errno=HA_ERR_NO_ACTIVE_RECORD);
}
return my_errno=HA_ERR_NO_ACTIVE_RECORD ;
return mi_delete(info->current_table->table,record);
}
......@@ -20,9 +20,7 @@
#include "myrg_def.h"
int myrg_lock_database(
MYRG_INFO *info,
int lock_type)
int myrg_lock_database(MYRG_INFO *info, int lock_type)
{
int error,new_error;
MYRG_TABLE *file;
......
......@@ -25,6 +25,9 @@ int myrg_rnext(MYRG_INFO *info, byte *buf, int inx)
int err;
MI_INFO *mi;
if (!info->current_table)
return HA_ERR_KEY_NOT_FOUND;
/* at first, do rnext for the table found before */
if ((err=mi_rnext(info->current_table->table,NULL,inx)))
{
......
......@@ -25,8 +25,8 @@ int myrg_rprev(MYRG_INFO *info, byte *buf, int inx)
int err;
MI_INFO *mi;
if (!info || !info->current_table)
return HA_ERR_UNSUPPORTED;
if (!info->current_table)
return HA_ERR_KEY_NOT_FOUND;
/* at first, do rprev for the table found before */
if ((err=mi_rprev(info->current_table->table,NULL,inx)))
......
......@@ -24,7 +24,7 @@
static MYRG_TABLE *find_table(MYRG_TABLE *start,MYRG_TABLE *end,ulonglong pos);
/*
If filepos == HA_OFFSET_ERROR, read next
If filepos == HA_OFFSET_ERROR, read next
Returns same as mi_rrnd:
0 = Ok.
HA_ERR_RECORD_DELETED = Record is deleted.
......
......@@ -19,12 +19,10 @@
int myrg_rsame(MYRG_INFO *info,byte *record,int inx)
{
if (inx) /* not yet used, should be 0 */
{
return(my_errno=HA_ERR_WRONG_INDEX);
}
return my_errno=HA_ERR_WRONG_INDEX;
if (!info->current_table)
{
return(my_errno=HA_ERR_NO_ACTIVE_RECORD);
}
return my_errno=HA_ERR_NO_ACTIVE_RECORD;
return mi_rsame(info->current_table->table,record,inx);
}
......@@ -21,6 +21,7 @@
int myrg_update(register MYRG_INFO *info,const byte *oldrec, byte *newrec)
{
if (!info->current_table)
return(my_errno=HA_ERR_NO_ACTIVE_RECORD);
return my_errno=HA_ERR_NO_ACTIVE_RECORD;
return mi_update(info->current_table->table,oldrec,newrec);
}
......@@ -26,5 +26,5 @@ int myrg_write(register MYRG_INFO *info, byte *rec)
else if (info->merge_insert_method == MERGE_INSERT_TO_LAST)
return mi_write(info->end_table[-1].table,rec);
else /* unsupported insertion method */
return (my_errno=HA_ERR_WRONG_COMMAND);
return my_errno=HA_ERR_WRONG_COMMAND;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment