From f8d6d13781d45ecfe2893d9d2a2ff4564da4eb97 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 Dec 2005 15:00:18 +0300 Subject: The innodb-5.0-ss52 snapshot changes were erroneously auto-merged to 5.1. Undoing the merge. mysql-test/r/innodb.result: Undoing erroneous auto-merge 5.0 -> 5.1 mysql-test/t/innodb.test: Undoing erroneous auto-merge 5.0 -> 5.1 sql/ha_innodb.cc: Undoing erroneous auto-merge 5.0 -> 5.1 sql/ha_innodb.h: Undoing erroneous auto-merge 5.0 -> 5.1 storage/innobase/btr/btr0sea.c: Undoing erroneous auto-merge 5.0 -> 5.1 storage/innobase/dict/dict0dict.c: Undoing erroneous auto-merge 5.0 -> 5.1 storage/innobase/dict/dict0load.c: Undoing erroneous auto-merge 5.0 -> 5.1 storage/innobase/include/buf0buf.h: Undoing erroneous auto-merge 5.0 -> 5.1 storage/innobase/include/dict0dict.h: Undoing erroneous auto-merge 5.0 -> 5.1 storage/innobase/include/dict0load.h: Undoing erroneous auto-merge 5.0 -> 5.1 storage/innobase/include/rem0cmp.h: Undoing erroneous auto-merge 5.0 -> 5.1 storage/innobase/rem/rem0cmp.c: Undoing erroneous auto-merge 5.0 -> 5.1 storage/innobase/row/row0mysql.c: Undoing erroneous auto-merge 5.0 -> 5.1 --- sql/ha_innodb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/ha_innodb.h') diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h index f9a185bd885..9e701e8826b 100644 --- a/sql/ha_innodb.h +++ b/sql/ha_innodb.h @@ -110,7 +110,7 @@ class ha_innobase: public handler but currently MySQL does not work with keys whose size is > MAX_KEY_LENGTH */ uint max_supported_key_length() const { return 3500; } - uint max_supported_key_part_length() const; + uint max_supported_key_part_length() const { return 3500; } const key_map *keys_to_use_for_scanning() { return &key_map_full; } bool has_transactions() { return 1;} -- cgit v1.2.1