diff options
| author | unknown <sergefp@mysql.com> | 2004-05-29 20:55:46 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-05-29 20:55:46 +0400 |
| commit | b7130450950898892f14f2a1fef462ecac49e92a (patch) | |
| tree | 0107d5b2c95123b7a602a9f396d6aca05ce21a54 /include/my_base.h | |
| parent | b0921b1f5a1f610b04641a83d0d7b21e3fe46d84 (diff) | |
| parent | 2164db3c8c4c086dcc16d73baf7557a344d82129 (diff) | |
| download | mariadb-git-b7130450950898892f14f2a1fef462ecac49e92a.tar.gz | |
Manual merge
include/my_base.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/r/index_merge.result:
Auto merged
mysql-test/r/index_merge_innodb.result:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/opt_range.cc:
Hand merged
sql/opt_range.h:
Hand merged
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h index 54c739bde23..1fa168e21cc 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -146,7 +146,13 @@ enum ha_extra_function { On-the-fly switching between unique and non-unique key inserting. */ HA_EXTRA_CHANGE_KEY_TO_UNIQUE, - HA_EXTRA_CHANGE_KEY_TO_DUP + HA_EXTRA_CHANGE_KEY_TO_DUP, + /* + When using HA_EXTRA_KEYREAD, overwrite only key member fields and keep + other fields intact. When this is off (by default) InnoDB will use memcpy + to overwrite entire row. + */ + HA_EXTRA_KEYREAD_PRESERVE_FIELDS }; /* The following is parameter to ha_panic() */ |