diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-04 15:40:55 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-04 15:40:55 +0200 |
| commit | 8ce6c9fc6c3091c43ab91980fe904ed5125ba597 (patch) | |
| tree | 49da2620373e1b4c73d505405819d5d7097786bc /include/my_base.h | |
| parent | f67891c24422a223a50a2477883e587c520057ad (diff) | |
| parent | e229fe9801cc9fb7e3783cf708bc7cb695606c64 (diff) | |
| download | mariadb-git-8ce6c9fc6c3091c43ab91980fe904ed5125ba597.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysys/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/my_base.h b/include/my_base.h index ccca3f74ec4..6efac979a4e 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -107,9 +107,6 @@ enum ha_extra_function { HA_EXTRA_IGNORE_DUP_KEY, /* Dup keys don't rollback everything*/ HA_EXTRA_NO_IGNORE_DUP_KEY, HA_EXTRA_DONT_USE_CURSOR_TO_UPDATE, /* Cursor will not be used for update */ - HA_EXTRA_BULK_INSERT_BEGIN, - HA_EXTRA_BULK_INSERT_FLUSH, /* Flush one index */ - HA_EXTRA_BULK_INSERT_END, HA_EXTRA_PREPARE_FOR_DELETE, HA_EXTRA_PREPARE_FOR_UPDATE /* Remove read cache if problems */ }; |