Commit 182de7c2 authored by unknown's avatar unknown

Add CHARSET keyword (missing from last push)


sql/field.cc:
  Small safety fix
parent 934f5cc4
...@@ -4220,9 +4220,11 @@ void Field_blob::get_key_image(char *buff,uint length) ...@@ -4220,9 +4220,11 @@ void Field_blob::get_key_image(char *buff,uint length)
char *blob; char *blob;
if ((uint32) length > blob_length) 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)); bzero(buff+2+blob_length, (length-blob_length));
#endif
length=(uint) blob_length; length=(uint) blob_length;
} }
int2store(buff,length); int2store(buff,length);
......
...@@ -80,6 +80,7 @@ static SYMBOL symbols[] = { ...@@ -80,6 +80,7 @@ static SYMBOL symbols[] = {
{ "CASE", SYM(CASE_SYM),0,0}, { "CASE", SYM(CASE_SYM),0,0},
{ "CHAR", SYM(CHAR_SYM),0,0}, { "CHAR", SYM(CHAR_SYM),0,0},
{ "CHARACTER", SYM(CHAR_SYM),0,0}, { "CHARACTER", SYM(CHAR_SYM),0,0},
{ "CHARSET", SYM(CHARSET),0,0},
{ "CHANGE", SYM(CHANGE),0,0}, { "CHANGE", SYM(CHANGE),0,0},
{ "CHANGED", SYM(CHANGED),0,0}, { "CHANGED", SYM(CHANGED),0,0},
{ "CHECK", SYM(CHECK_SYM),0,0}, { "CHECK", SYM(CHECK_SYM),0,0},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment