diff options
| author | unknown <monty@mysql.com> | 2006-03-29 17:28:40 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-03-29 17:28:40 +0300 |
| commit | 9f6cf5b6cc04688fb28120df63345e6d39896f72 (patch) | |
| tree | daf258f3699521e64ef40579e39c6714eca08925 /sql/ha_heap.cc | |
| parent | b002c11756aa59273b548c442dd69c8f41a9e9e2 (diff) | |
| parent | 8ac1d552861a673bb01b5deb5c9009c312494149 (diff) | |
| download | mariadb-git-9f6cf5b6cc04688fb28120df63345e6d39896f72.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/my/mysql-5.1
mysql-test/r/ndb_condition_pushdown.result:
Auto merged
mysql-test/t/ndb_condition_pushdown.test:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
Diffstat (limited to 'sql/ha_heap.cc')
| -rw-r--r-- | sql/ha_heap.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc index 02af9fb6918..fc5cf8bbd2c 100644 --- a/sql/ha_heap.cc +++ b/sql/ha_heap.cc @@ -60,7 +60,8 @@ handlerton heap_hton= { NULL, /* Fill Files Table */ HTON_CAN_RECREATE, NULL, /* binlog_func */ - NULL /* binlog_log_query */ + NULL, /* binlog_log_query */ + NULL /* release_temporary_latches */ }; static handler *heap_create_handler(TABLE_SHARE *table) |