mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge work:/home/bk/mysql-4.0

Browse source 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
This commit is contained in:
unknown 2002-06-25 19:11:25 +02:00
commit ea01d6572a
8 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
myisammrg/myrg_delete.c
View file

@ -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);
}

4
myisammrg/myrg_locking.c
View file

@ -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;

3
myisammrg/myrg_rnext.c
View 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)))
{

4
myisammrg/myrg_rprev.c
View file

@ -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)))

2
myisammrg/myrg_rrnd.c
View file

@ -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.

10
myisammrg/myrg_rsame.c
View file

@ -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);
}

3
myisammrg/myrg_update.c
View file

@ -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);
}

2
myisammrg/myrg_write.c
View file

@ -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;
}