Commit 62689e18 authored by unknown's avatar unknown
Browse files

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

into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge


sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
  Auto merged
BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927:
  Auto merged
BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
  Auto merged
BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_archive.h:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/ha_blackhole.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/examples/ha_example.h:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/examples/ha_tina.h:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  merge
sql/ha_ndbcluster.h:
  merge
sql/handler.h:
  merge
sql/sql_select.cc:
  merge
parents 4416725b 44a882f9

sql/examples/ha_example.cc

+2 −2
Original line number Diff line number Diff line
@@ -523,10 +523,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
@@ -136,7 +136,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
@@ -792,13 +792,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_is_known && records < 2) 

    records= 2;

  DBUG_VOID_RETURN;

  DBUG_RETURN(0);

}



/*

sql/examples/ha_tina.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ class ha_tina: public handler 
  int rnd_pos(byte * buf, byte *pos);

  int rnd_end();

  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/ha_archive.cc

+2 −2
Original line number Diff line number Diff line
@@ -1115,7 +1115,7 @@ THR_LOCK_DATA **ha_archive::store_lock(THD *thd, 
/*

  Hints for optimizer, see ha_tina for more information

*/

void ha_archive::info(uint flag)

int ha_archive::info(uint flag)

{

  DBUG_ENTER("ha_archive::info");

  /*
@@ -1140,7 +1140,7 @@ void ha_archive::info(uint flag) 
  delete_length= 0;

  index_file_length=0;



  DBUG_VOID_RETURN;

  DBUG_RETURN(0);

}