diff options
| author | unknown <brian@zim.(none)> | 2005-10-02 20:13:18 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-10-02 20:13:18 -0700 |
| commit | 27cc798d5f098f81f04567907797777326086d02 (patch) | |
| tree | 0d6229a55087d478a4a78a95c498d0e963d270d8 /sql/ha_heap.cc | |
| parent | 88149062985c725dc3f02ef7d0a375a927fd3c06 (diff) | |
| parent | 1cb47ed1f4bfdab6c80895ec22c288fa6d41ca68 (diff) | |
| download | mariadb-git-27cc798d5f098f81f04567907797777326086d02.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/brian/mysql/fix-5.0
sql/ha_blackhole.cc:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/examples/ha_example.cc:
Auto merged
sql/examples/ha_tina.cc:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/ha_archive.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/ha_federated.cc:
Merge fix.
Diffstat (limited to 'sql/ha_heap.cc')
| -rw-r--r-- | sql/ha_heap.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc index ad7da559ff4..98cc96db707 100644 --- a/sql/ha_heap.cc +++ b/sql/ha_heap.cc @@ -25,6 +25,10 @@ handlerton heap_hton= { "MEMORY", + SHOW_OPTION_YES, + "Hash based, stored in memory, useful for temporary tables", + DB_TYPE_HEAP, + NULL, 0, /* slot */ 0, /* savepoint size. */ NULL, /* close_connection */ |