diff options
author | unknown <sergefp@mysql.com> | 2004-05-13 01:49:47 +0400 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2004-05-13 01:49:47 +0400 |
commit | fee57535b774e08ab854651badfe59b00b27c185 (patch) | |
tree | c476a92e4fdd992d29c2236102f35fd64e43857f /include/my_base.h | |
parent | f3a16fef8f178b5edc47bec2c5f353495059edcf (diff) | |
parent | 3600d09ab4323098676fa51c869a787fec9d42cc (diff) | |
download | mariadb-git-fee57535b774e08ab854651badfe59b00b27c185.tar.gz |
Manual merge
include/my_sys.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/row/row0sel.c:
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_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_test.cc:
Auto merged
include/my_base.h:
Manually merged
sql/opt_range.cc:
Manually merged
sql/opt_range.h:
Manually merged
sql/sql_delete.cc:
Manually merged
sql/sql_update.cc:
Manually merged
Diffstat (limited to 'include/my_base.h')
-rw-r--r-- | include/my_base.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/my_base.h b/include/my_base.h index d23a70b8a55..1017a518ae8 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -147,6 +147,12 @@ enum ha_extra_function { */ HA_EXTRA_CHANGE_KEY_TO_UNIQUE, 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() */ |