diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-07-15 00:33:24 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-07-15 00:33:24 -0600 |
| commit | 690101ad882c603a00981e6e5be58f61888d8ad0 (patch) | |
| tree | a5e74a70e567b375faa67837da8854bcf895758f /include/my_base.h | |
| parent | d6e3a9ddcb6a877feb65a98953b3ec9e6426be47 (diff) | |
| parent | 906cd90d936e384af54c1f4e75ebb56bd2f6b148 (diff) | |
| download | mariadb-git-690101ad882c603a00981e6e5be58f61888d8ad0.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into siva.hindu.god:/usr/home/tim/m/bk/merge-51
(which is mysql-5.1-new-maint team tree)
include/my_base.h:
Auto merged
mysql-test/extra/rpl_tests/rpl_loaddata.test:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/lib/mtr_report.pl:
merge of mysql-5.1 -> mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
merge of mysql-5.1 -> mysql-5.1-new-maint
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index 4bcfb03affb..d75df093a11 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -155,7 +155,16 @@ enum ha_extra_function { Mark the table as a log table. For some handlers (e.g. CSV) this results in a special locking for the table. */ - HA_EXTRA_MARK_AS_LOG_TABLE + HA_EXTRA_MARK_AS_LOG_TABLE, + /* + Informs handler that write_row() which tries to insert new row into the + table and encounters some already existing row with same primary/unique + key can replace old row with new row instead of reporting error (basically + it informs handler that we do REPLACE instead of simple INSERT). + Off by default. + */ + HA_EXTRA_WRITE_CAN_REPLACE, + HA_EXTRA_WRITE_CANNOT_REPLACE }; /* The following is parameter to ha_panic() */ |