Commit 3bd8dba6 authored by serg@sergbook.mysql.com's avatar serg@sergbook.mysql.com
Browse files

Merge work:/home/bk/mysql-4.0 

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents a028bb1d aff5d8fd

myisammrg/myrg_delete.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

}

myisammrg/myrg_locking.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

myisammrg/myrg_rnext.c

+3 −0
Original line number Diff line number Diff line
@@ -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)))

  {

myisammrg/myrg_rprev.c

+2 −2
Original line number Diff line number Diff line
@@ -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)))

myisammrg/myrg_rsame.c

+4 −6
Original line number Diff line number Diff line
@@ -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);

}