bk commit into 4.0 tree (bell:1.2161)

[sanja]

Below is the list of changes that have just been committed into a local
4.0 repository of bell. When bell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2161 05/11/22 10:55:06 bell@stripped +1 -0
  Merge abelkin@stripped:/home/bk/mysql-4.0
  into  sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0

  sql/mysql_priv.h
    1.238 05/11/22 10:55:04 bell@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/mysql-4.0/RESYNC

--- 1.237/sql/mysql_priv.h	2005-09-06 11:16:51 +03:00
+++ 1.238/sql/mysql_priv.h	2005-11-22 10:55:04 +02:00
@@ -549,7 +549,8 @@
 int mysql_ha_close(THD *thd, TABLE_LIST *tables);
 int mysql_ha_read(THD *, TABLE_LIST *,enum enum_ha_read_modes,char *,
                List<Item> *,enum ha_rkey_function,Item *,ha_rows,ha_rows);
-int mysql_ha_flush(THD *thd, TABLE_LIST *tables, uint mode_flags);
+int mysql_ha_flush(THD *thd, TABLE_LIST *tables, uint mode_flags,
+                   bool is_locked);
 /* mysql_ha_flush mode_flags bits */
 #define MYSQL_HA_CLOSE_FINAL        0x00
 #define MYSQL_HA_REOPEN_ON_USAGE    0x01