diff options
| author | monty@mysql.com <> | 2004-12-18 05:19:21 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-12-18 05:19:21 +0200 |
| commit | 3fb088a075ebd3e4fe78d122911103618bd1cbe4 (patch) | |
| tree | eb62c04f31efc6c7cb435cef36a43e2e361eed1c /sql/ha_heap.cc | |
| parent | b4dc75c877b45e2eb97e5fc15fda4292e0f6f705 (diff) | |
| download | mariadb-git-3fb088a075ebd3e4fe78d122911103618bd1cbe4.tar.gz | |
Add 0x before pointers (to help with debugging)
Add support for VARCHAR with 1 or 2 length bytes
Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly)
Give error if we got problems in temporary tables during a SELECT
Don't use new table generated by ALTER TABLE if index generation fails
Fixed wrong call by range_end() (Could cause an ASSERT in debug mode)
Diffstat (limited to 'sql/ha_heap.cc')
| -rw-r--r-- | sql/ha_heap.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc index 60555d51402..1556a18bfca 100644 --- a/sql/ha_heap.cc +++ b/sql/ha_heap.cc @@ -488,8 +488,10 @@ int ha_heap::create(const char *name, TABLE *table_arg, else { if ((seg->type = field->key_type()) != (int) HA_KEYTYPE_TEXT && - seg->type != HA_KEYTYPE_VARTEXT && - seg->type != HA_KEYTYPE_VARBINARY) + seg->type != HA_KEYTYPE_VARTEXT1 && + seg->type != HA_KEYTYPE_VARTEXT2 && + seg->type != HA_KEYTYPE_VARBINARY1 && + seg->type != HA_KEYTYPE_VARBINARY2) seg->type= HA_KEYTYPE_BINARY; } seg->start= (uint) key_part->offset; |