diff options
| author | unknown <monty@donna.mysql.com> | 2000-09-20 04:59:34 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-09-20 04:59:34 +0300 |
| commit | 5993b4947b23e4aca2dfc7b7f92b30f14e56c04f (patch) | |
| tree | 47e17b2858b02fa9f69cb087e6add8a937bbd62f /sql/mysql_priv.h | |
| parent | 96b2e908528a5532eb89468569a6db302182d37c (diff) | |
| parent | 5a2419eb89d2f617e94ebef64ffbef72417ec94c (diff) | |
| download | mariadb-git-5993b4947b23e4aca2dfc7b7f92b30f14e56c04f.tar.gz | |
merge
mysys/mf_format.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index f74dd0f281c..dd87f40efe9 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -156,6 +156,7 @@ void sql_element_free(void *ptr); #define OPTION_BIN_LOG OPTION_BUFFER_RESULT*2 #define OPTION_AUTO_COMMIT OPTION_BIN_LOG*2 #define OPTION_BEGIN OPTION_AUTO_COMMIT*2 +#define OPTION_QUICK OPTION_BEGIN*2 #define RAID_BLOCK_SIZE 1024 @@ -324,7 +325,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table,List<Item> &fields, thr_lock_type lock_type); void kill_delayed_threads(void); int mysql_delete(THD *thd,TABLE_LIST *table,COND *conds,ha_rows rows, - thr_lock_type lock_type); + thr_lock_type lock_type, ulong options); TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update); TABLE *open_table(THD *thd,const char *db,const char *table,const char *alias, bool *refresh); |