diff options
| author | unknown <monty@mysql.com> | 2004-10-07 12:51:32 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-07 12:51:32 +0300 |
| commit | 9232c91d392c8dfe9ce4c6809b68c7eb23f93df8 (patch) | |
| tree | c40a3078a450f8748d8f07f48bdbf35e59d7f9a0 /sql/mysql_priv.h | |
| parent | 5b3444d2faf45786e5f6078e442e0514c8b2814e (diff) | |
| parent | 1601646a8846c5246d803411fc349237bfdd998b (diff) | |
| download | mariadb-git-9232c91d392c8dfe9ce4c6809b68c7eb23f93df8.tar.gz | |
Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
client/mysqlimport.c:
Auto merged
myisam/mi_locking.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_handler.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 538590e6197..314ee07eb1a 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -681,7 +681,7 @@ int mysql_ha_open(THD *thd, TABLE_LIST *tables, bool reopen= 0); 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, int mode_flags); +int mysql_ha_flush(THD *thd, TABLE_LIST *tables, uint mode_flags); /* mysql_ha_flush mode_flags bits */ #define MYSQL_HA_CLOSE_FINAL 0x00 #define MYSQL_HA_REOPEN_ON_USAGE 0x01 |