Commit 2bb8cb18 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 

into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2


sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 55995148 8335ed73

sql/examples/ha_archive.cc

+2 −2
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ int ha_archive::index_last(byte * buf) 
}





void ha_archive::info(uint flag)

int ha_archive::info(uint flag)

{

  DBUG_ENTER("ha_archive::info");
@@ -980,7 +980,7 @@ void ha_archive::info(uint flag) 
  records= share->rows_recorded;

  deleted= 0;



  DBUG_VOID_RETURN;

  DBUG_RETURN(0);

}



int ha_archive::extra(enum ha_extra_function operation)

sql/examples/ha_archive.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ class ha_archive: public handler 
  int read_data_header(gzFile file_to_read);

  int write_data_header(gzFile file_to_write);

  void position(const byte *record);

  void info(uint);

  int info(uint);

  int extra(enum ha_extra_function operation);

  int reset(void);

  int external_lock(THD *thd, int lock_type);

sql/examples/ha_example.cc

+2 −2
Original line number Diff line number Diff line
@@ -486,10 +486,10 @@ int ha_example::rnd_pos(byte * buf, byte *pos) 
    sql_update.cc



*/

void ha_example::info(uint flag)

int ha_example::info(uint flag)

{

  DBUG_ENTER("ha_example::info");

  DBUG_VOID_RETURN;

  DBUG_RETURN(0);

}

sql/examples/ha_example.h

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ class ha_example: public handler 
  int rnd_next(byte *buf);                                      //required

  int rnd_pos(byte * buf, byte *pos);                           //required

  void position(const byte *record);                            //required

  void info(uint);                                              //required

  int info(uint);                                              //required



  int extra(enum ha_extra_function operation);

  int reset(void);

sql/examples/ha_tina.cc

+2 −2
Original line number Diff line number Diff line
@@ -683,13 +683,13 @@ int ha_tina::rnd_pos(byte * buf, byte *pos) 
  Currently this table handler doesn't implement most of the fields

  really needed. SHOW also makes use of this data

*/

void ha_tina::info(uint flag)

int ha_tina::info(uint flag)

{

  DBUG_ENTER("ha_tina::info");

  /* This is a lie, but you don't want the optimizer to see zero or 1 */

  if (records < 2) 

    records= 2;

  DBUG_VOID_RETURN;

  DBUG_RETURN(0);

}



/*