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 /innobase/include/row0mysql.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 'innobase/include/row0mysql.h')
| -rw-r--r-- | innobase/include/row0mysql.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/innobase/include/row0mysql.h b/innobase/include/row0mysql.h index 0b9f34dda1e..4c4b13f815f 100644 --- a/innobase/include/row0mysql.h +++ b/innobase/include/row0mysql.h @@ -572,6 +572,10 @@ struct row_prebuilt_struct { allocated mem buf start, because there is a 4 byte magic number at the start and at the end */ + ibool keep_other_fields_on_keyread; /* when using fetch + cache with HA_EXTRA_KEYREAD, don't + overwrite other fields in mysql row + row buffer.*/ ulint fetch_cache_first;/* position of the first not yet fetched row in fetch_cache */ ulint n_fetch_cached; /* number of not yet fetched rows |