database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
This commit is contained in:
unknown
2005-03-29 18:48:31 +02:00
parent 2c546db390 0b45706c3b
commit 01ba6b1d09
6 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/type_blob.result
View File

@@ -27,7 +27,7 @@ t3 CREATE TABLE `t3` (
drop table t1,t2,t3 drop table t1,t2,t3
#; #;
CREATE TABLE t1 (a char(257) default "hello"); 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"); CREATE TABLE t2 (a blob default "hello");
ERROR 42000: BLOB/TEXT column 'a' can't have a default value ERROR 42000: BLOB/TEXT column 'a' can't have a default value
drop table if exists t1,t2; drop table if exists t1,t2;

2
sql/mysqld.cc
View File

@@ -3990,8 +3990,6 @@ errorconn:
NullS); NullS);
sql_perror(buff); sql_perror(buff);
} }
my_security_attr_free(sa_event);
my_security_attr_free(sa_mapping);
if (handle_client_file_map) if (handle_client_file_map)
CloseHandle(handle_client_file_map); CloseHandle(handle_client_file_map);
if (handle_client_map) if (handle_client_map)

2
sql/share/english/errmsg.txt
View File

@@ -90,7 +90,7 @@ character-set=latin1
"Specified key was too long; max key length is %d bytes", "Specified key was too long; max key length is %d bytes",
"Key column '%-.64s' doesn't exist in table", "Key column '%-.64s' doesn't exist in table",
"BLOB column '%-.64s' can't be used in key specification with the used table type", "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", "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: ready for connections.\nVersion: '%s' socket: '%s' port: %d",
"%s: Normal shutdown\n", "%s: Normal shutdown\n",

6
strings/ctype-big5.c
View File

@@ -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 */ const char *emb= e - 1; /* Last possible end of an MB character */
while (pos && b < e) while (pos && b < e)
{ {
/* if ((uchar) b[0] < 128)
Cast to int8 for extra safety. "char" can be unsigned
by default on some platforms.
*/
if (((int8)b[0]) >= 0)
{ {
/* Single byte ascii character */ /* Single byte ascii character */
b++; b++;

7
strings/ctype-sjis.c
View File

@@ -4576,12 +4576,7 @@ uint my_well_formed_len_sjis(CHARSET_INFO *cs __attribute__((unused)),
const char *b0= b; const char *b0= b;
while (pos && b < e) while (pos && b < e)
{ {
/* if ((uchar) b[0] < 128)
Cast to int8 for extra safety.
"char" can be unsigned by default
on some platforms.
*/
if (((int8)b[0]) >= 0)
{ {
/* Single byte ascii character */ /* Single byte ascii character */
b++; b++;

9
strings/ctype-utf8.c
View File

@@ -2129,12 +2129,7 @@ int my_strcasecmp_utf8(CHARSET_INFO *cs, const char *s, const char *t)
{ {
my_wc_t s_wc,t_wc; my_wc_t s_wc,t_wc;
/* if ((uchar) s[0] < 128)
Cast to int8 for extra safety.
char can be unsigned by default
on some platforms.
*/
if (((int8)s[0]) >= 0)
{ {
/* /*
s[0] is between 0 and 127. 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 */ /* Do the same for the second string */
if (((int8)t[0]) >= 0) if ((uchar) t[0] < 128)
{ {
/* Convert single byte character into weight */ /* Convert single byte character into weight */
t_wc= plane00[(uchar) t[0]].tolower; t_wc= plane00[(uchar) t[0]].tolower;