diff --git a/sql/field.cc b/sql/field.cc index afd594b7045..aae4fac2a38 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4220,9 +4220,11 @@ void Field_blob::get_key_image(char *buff,uint length) char *blob; if ((uint32) length > blob_length) { -#ifdef HAVE_purify + /* + Must clear this as we do a memcmp in opt_range.cc to detect + identical keys + */ bzero(buff+2+blob_length, (length-blob_length)); -#endif length=(uint) blob_length; } int2store(buff,length); diff --git a/sql/lex.h b/sql/lex.h index bf0abc323e1..826b9b4a9ef 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -80,6 +80,7 @@ static SYMBOL symbols[] = { { "CASE", SYM(CASE_SYM),0,0}, { "CHAR", SYM(CHAR_SYM),0,0}, { "CHARACTER", SYM(CHAR_SYM),0,0}, + { "CHARSET", SYM(CHARSET),0,0}, { "CHANGE", SYM(CHANGE),0,0}, { "CHANGED", SYM(CHANGED),0,0}, { "CHECK", SYM(CHECK_SYM),0,0},