diff options
| -rw-r--r-- | mysql-test/r/type_blob.result | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/share/english/errmsg.txt | 2 | ||||
| -rw-r--r-- | strings/ctype-big5.c | 6 | ||||
| -rw-r--r-- | strings/ctype-sjis.c | 7 | ||||
| -rw-r--r-- | strings/ctype-utf8.c | 9 |
6 files changed, 6 insertions, 22 deletions
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result index b1dc895ecc5..7481dc18641 100644 --- a/mysql-test/r/type_blob.result +++ b/mysql-test/r/type_blob.result @@ -27,7 +27,7 @@ t3 CREATE TABLE `t3` ( drop table t1,t2,t3 #; CREATE TABLE t1 (a char(257) default "hello"); -ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB instead +ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT instead CREATE TABLE t2 (a blob default "hello"); ERROR 42000: BLOB/TEXT column 'a' can't have a default value drop table if exists t1,t2; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 05c3cb8deef..d75efbd0b00 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3990,8 +3990,6 @@ errorconn: NullS); sql_perror(buff); } - my_security_attr_free(sa_event); - my_security_attr_free(sa_mapping); if (handle_client_file_map) CloseHandle(handle_client_file_map); if (handle_client_map) diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 104a055417c..854adab455e 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -90,7 +90,7 @@ character-set=latin1 "Specified key was too long; max key length is %d bytes", "Key column '%-.64s' doesn't exist in table", "BLOB column '%-.64s' can't be used in key specification with the used table type", -"Column length too big for column '%-.64s' (max = %d); use BLOB instead", +"Column length too big for column '%-.64s' (max = %d); use BLOB or TEXT instead", "Incorrect table definition; there can be only one auto column and it must be defined as a key", "%s: ready for connections.\nVersion: '%s' socket: '%s' port: %d", "%s: Normal shutdown\n", diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c index 58847a96591..e083d1371ec 100644 --- a/strings/ctype-big5.c +++ b/strings/ctype-big5.c @@ -6284,11 +6284,7 @@ uint my_well_formed_len_big5(CHARSET_INFO *cs __attribute__((unused)), const char *emb= e - 1; /* Last possible end of an MB character */ while (pos && b < e) { - /* - Cast to int8 for extra safety. "char" can be unsigned - by default on some platforms. - */ - if (((int8)b[0]) >= 0) + if ((uchar) b[0] < 128) { /* Single byte ascii character */ b++; diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c index 0cb30a9b6ee..20f0081888f 100644 --- a/strings/ctype-sjis.c +++ b/strings/ctype-sjis.c @@ -4576,12 +4576,7 @@ uint my_well_formed_len_sjis(CHARSET_INFO *cs __attribute__((unused)), const char *b0= b; while (pos && b < e) { - /* - Cast to int8 for extra safety. - "char" can be unsigned by default - on some platforms. - */ - if (((int8)b[0]) >= 0) + if ((uchar) b[0] < 128) { /* Single byte ascii character */ b++; diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index 4d2bff5e89f..83725878a50 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -2129,12 +2129,7 @@ int my_strcasecmp_utf8(CHARSET_INFO *cs, const char *s, const char *t) { my_wc_t s_wc,t_wc; - /* - Cast to int8 for extra safety. - char can be unsigned by default - on some platforms. - */ - if (((int8)s[0]) >= 0) + if ((uchar) s[0] < 128) { /* s[0] is between 0 and 127. @@ -2181,7 +2176,7 @@ int my_strcasecmp_utf8(CHARSET_INFO *cs, const char *s, const char *t) /* Do the same for the second string */ - if (((int8)t[0]) >= 0) + if ((uchar) t[0] < 128) { /* Convert single byte character into weight */ t_wc= plane00[(uchar) t[0]].tolower; |