summaryrefslogtreecommitdiff
path: root/sql/ha_heap.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-12-07 15:47:00 +0200
committermonty@mysql.com <>2004-12-07 15:47:00 +0200
commit563500994a31c2239a7d87ba9c5ea889493e3596 (patch)
treeb1c918186908fb490aa860c35dc9e2154aa633c8 /sql/ha_heap.cc
parent77207d19f20f21c54b8d5279c6924f4c4bdaaa51 (diff)
downloadmariadb-git-563500994a31c2239a7d87ba9c5ea889493e3596.tar.gz
Update results for new varchar handling
Fixed compiler warnings String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
Diffstat (limited to 'sql/ha_heap.cc')
-rw-r--r--sql/ha_heap.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc
index 29508207a70..60555d51402 100644
--- a/sql/ha_heap.cc
+++ b/sql/ha_heap.cc
@@ -98,6 +98,7 @@ void ha_heap::set_keys_for_scanning(void)
}
}
+
void ha_heap::update_key_stats()
{
for (uint i= 0; i < table->keys; i++)
@@ -113,6 +114,7 @@ void ha_heap::update_key_stats()
records_changed= 0;
}
+
int ha_heap::write_row(byte * buf)
{
int res;
@@ -439,8 +441,7 @@ ha_rows ha_heap::records_in_range(uint inx, key_range *min_key,
min_key->flag != HA_READ_KEY_EXACT ||
max_key->flag != HA_READ_AFTER_KEY)
return HA_POS_ERROR; // Can only use exact keys
- else
- return key->rec_per_key[key->key_parts-1];
+ return key->rec_per_key[key->key_parts-1];
}