diff options
| author | unknown <konstantin@mysql.com> | 2006-02-08 23:53:45 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-02-08 23:53:45 +0300 |
| commit | ea6aba52c1919d7cdb1344cc67efe5f89df2006a (patch) | |
| tree | 7d495dc3bafe88ef93bc51491f32afbb3efca087 /sql/ha_heap.h | |
| parent | 2dc19ba63c94e3dc4d79e30b9825b6ff03c05ac3 (diff) | |
| parent | cf4b6ee4c01ca9e002511ad221872b4182b910fa (diff) | |
| download | mariadb-git-ea6aba52c1919d7cdb1344cc67efe5f89df2006a.tar.gz | |
Merge mysql.com:/home/kostja/mysql/tmp_merge
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
configure.in:
Auto merged
include/heap.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_heap.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
storage/heap/hp_create.c:
Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/sql_update.cc:
Manual merge
tests/mysql_client_test.c:
SCCS merged
Diffstat (limited to 'sql/ha_heap.h')
| -rw-r--r-- | sql/ha_heap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_heap.h b/sql/ha_heap.h index 909b36f975b..9b9b7f90d90 100644 --- a/sql/ha_heap.h +++ b/sql/ha_heap.h @@ -29,7 +29,7 @@ class ha_heap: public handler key_map btree_keys; /* number of records changed since last statistics update */ uint records_changed; - bool key_stats_ok; + uint key_stat_version; public: ha_heap(TABLE_SHARE *table); ~ha_heap() {} |