Commit 99c3faa5 authored by unknown's avatar unknown
Browse files

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  zim.(none):/home/brian/mysql/foo-5.0
parents de1254ad 3096eac9

sql/examples/ha_archive.h

+6 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ class ha_archive: public handler 
  z_off_t current_position;  /* The position of the row we just read */

  byte byte_buffer[IO_SIZE]; /* Initial buffer for our string */

  String buffer;             /* Buffer used for blob storage */

  ulonglong scan_rows;       /* Number of rows left in scan */

  ha_rows scan_rows;         /* Number of rows left in scan */

  bool delayed_insert;       /* If the insert is delayed */

  bool bulk_insert;          /* If we are performing a bulk insert */
@@ -102,6 +102,10 @@ class ha_archive: public handler 
  int repair(THD* thd, HA_CHECK_OPT* check_opt);

  void start_bulk_insert(ha_rows rows);

  int end_bulk_insert();

  enum row_type get_row_type() const 

  { 

    return ROW_TYPE_COMPRESSED;

  }

  THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,

                             enum thr_lock_type lock_type);

};