Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
b88ed6c7
Commit
b88ed6c7
authored
Mar 29, 2005
by
kent@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
parents
65294b3b
5085f368
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
22 deletions
+6
-22
mysql-test/r/type_blob.result
mysql-test/r/type_blob.result
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+0
-2
sql/share/english/errmsg.txt
sql/share/english/errmsg.txt
+1
-1
strings/ctype-big5.c
strings/ctype-big5.c
+1
-5
strings/ctype-sjis.c
strings/ctype-sjis.c
+1
-6
strings/ctype-utf8.c
strings/ctype-utf8.c
+2
-7
No files found.
mysql-test/r/type_blob.result
View file @
b88ed6c7
...
...
@@ -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;
...
...
sql/mysqld.cc
View file @
b88ed6c7
...
...
@@ -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
)
...
...
sql/share/english/errmsg.txt
View file @
b88ed6c7
...
...
@@ -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",
...
...
strings/ctype-big5.c
View file @
b88ed6c7
...
...
@@ -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
++
;
...
...
strings/ctype-sjis.c
View file @
b88ed6c7
...
...
@@ -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
++
;
...
...
strings/ctype-utf8.c
View file @
b88ed6c7
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment