diff options
| author | unknown <jimw@mysql.com> | 2005-01-13 17:38:13 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-13 17:38:13 -0800 |
| commit | 8a5fe7cfdfb8ff893c387153bee7c1600cd0795b (patch) | |
| tree | 5b093c9fc53f3273eb056f91849529e6083a5c77 /sql/ha_heap.h | |
| parent | fd7e0d847b6fd2d0f9729b3c6a37f19e62d67128 (diff) | |
| download | mariadb-git-8a5fe7cfdfb8ff893c387153bee7c1600cd0795b.tar.gz | |
Output 'MEMORY' as table type for tables using the memory (nee heap) storage
engine, except when running with sql_mode & MYSQL323. (Bug #6659)
mysql-test/r/create.result:
Fix test results
mysql-test/r/ctype_utf8.result:
Fix test results
mysql-test/r/information_schema.result:
Fix results
mysql-test/r/show_check.result:
Fix results
sql/ha_heap.h:
Output 'HEAP' in MySQL 3.23 compatibility mode
mysql-test/r/heap.result:
Update results
mysql-test/r/sql_mode.result:
Update results
Diffstat (limited to 'sql/ha_heap.h')
| -rw-r--r-- | sql/ha_heap.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/ha_heap.h b/sql/ha_heap.h index 8b44695df07..fb526888b01 100644 --- a/sql/ha_heap.h +++ b/sql/ha_heap.h @@ -32,7 +32,11 @@ class ha_heap: public handler public: ha_heap(TABLE *table): handler(table), file(0), records_changed(0) {} ~ha_heap() {} - const char *table_type() const { return "HEAP"; } + const char *table_type() const + { + return (table->in_use->variables.sql_mode & MODE_MYSQL323) ? + "HEAP" : "MEMORY"; + } const char *index_type(uint inx) { return ((table->key_info[inx].algorithm == HA_KEY_ALG_BTREE) ? "BTREE" : |