Merge monty@192.168.0.9:/my/mysql-5.0

into  mysql.com:/my/mysql-5.0

mysql-test/r/bdb.result

@@ -1870,7 +1870,7 @@ a	b
 drop table t1;
 create table t1 (v varchar(65530), key(v));
 Warnings:
-Warning	1071	Specified key was too long; max key length is 1024 bytes
+Warning	1071	Specified key was too long; max key length is MAX_KEY_LENGTH bytes
 drop table if exists t1;
 create table t1 (v varchar(65536));
 Warnings:

mysql-test/t/bdb.test

@@ -962,6 +962,7 @@ source include/varchar.inc;
 # Some errors/warnings on create
 #
 
+--replace_result 1024 MAX_KEY_LENGTH 3072 MAX_KEY_LENGTH
 create table t1 (v varchar(65530), key(v));
 drop table if exists t1;
 create table t1 (v varchar(65536));