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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
e2d4dc23
Commit
e2d4dc23
authored
Dec 06, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
parents
c6b3c442
8ec6cf2c
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
329 additions
and
69 deletions
+329
-69
VC++Files/sql/mysqld.dsp
VC++Files/sql/mysqld.dsp
+87
-24
client/mysqldump.c
client/mysqldump.c
+1
-1
mysql-test/r/ctype_create.result
mysql-test/r/ctype_create.result
+9
-0
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_ucs.result
+56
-0
mysql-test/t/ctype_create.test
mysql-test/t/ctype_create.test
+12
-0
mysql-test/t/ctype_ucs.test
mysql-test/t/ctype_ucs.test
+31
-0
mysql-test/t/ps_1general.test
mysql-test/t/ps_1general.test
+2
-0
scripts/fill_help_tables.sh
scripts/fill_help_tables.sh
+8
-4
scripts/mysql_install_db.sh
scripts/mysql_install_db.sh
+1
-1
sql/field.cc
sql/field.cc
+10
-9
sql/item_strfunc.cc
sql/item_strfunc.cc
+0
-11
sql/mysql_priv.h
sql/mysql_priv.h
+17
-0
sql/net_serv.cc
sql/net_serv.cc
+2
-2
sql/sql_parse.cc
sql/sql_parse.cc
+29
-11
sql/sql_yacc.yy
sql/sql_yacc.yy
+8
-3
sql/strfunc.cc
sql/strfunc.cc
+17
-3
sql/table.cc
sql/table.cc
+17
-0
sql/unireg.cc
sql/unireg.cc
+22
-0
No files found.
VC++Files/sql/mysqld.dsp
View file @
e2d4dc23
...
...
@@ -924,76 +924,139 @@ SOURCE=.\message.mc
!IF "$(CFG)" == "mysqld - Win32 Release"
# Begin Custom Build
InputPath=.\message.mc
BuildCmds= \
mc message.mc
"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "mysqld - Win32 Debug"
# Begin Custom Build
InputPath=.\message.mc
BuildCmds= \
mc message.mc
"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "mysqld - Win32 nt"
# Begin Custom Build - Compiling messages
InputDir=.
# Begin Custom Build
InputPath=.\message.mc
InputName=message
BuildCmds= \
mc
.exe "$(InputDir)\$(InputName).mc"
mc
message.mc
"
$(InputDir)\$(InputName)
.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
"
message
.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"
$(InputDir)\$(InputName)
.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
"
message
.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "mysqld - Win32 Max nt"
# Begin Custom Build - Compiling messages
InputDir=.
# Begin Custom Build
InputPath=.\message.mc
InputName=message
BuildCmds= \
mc
.exe "$(InputDir)\$(InputName).mc"
mc
message.mc
"
$(InputDir)\$(InputName)
.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
"
message
.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"
$(InputDir)\$(InputName)
.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
"
message
.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "mysqld - Win32 Max"
# Begin Custom Build
InputPath=.\message.mc
BuildCmds= \
mc message.mc
"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "mysqld - Win32 classic"
# Begin Custom Build
InputPath=.\message.mc
BuildCmds= \
mc message.mc
"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "mysqld - Win32 pro"
# Begin Custom Build
InputPath=.\message.mc
BuildCmds= \
mc message.mc
"message.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"message.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "mysqld - Win32 classic nt"
# Begin Custom Build - Compiling messages
InputDir=.
# Begin Custom Build
InputPath=.\message.mc
InputName=message
BuildCmds= \
mc
.exe "$(InputDir)\$(InputName).mc"
mc
message.mc
"
$(InputDir)\$(InputName)
.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
"
message
.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"
$(InputDir)\$(InputName)
.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
"
message
.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "mysqld - Win32 pro nt"
# Begin Custom Build - Compiling messages
InputDir=.
# Begin Custom Build
InputPath=.\message.mc
InputName=message
BuildCmds= \
mc
.exe "$(InputDir)\$(InputName).mc"
mc
message.mc
"
$(InputDir)\$(InputName)
.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
"
message
.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
"
$(InputDir)\$(InputName)
.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
"
message
.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ENDIF
# End Source File
...
...
client/mysqldump.c
View file @
e2d4dc23
...
...
@@ -158,7 +158,7 @@ static struct my_option my_long_options[] =
(
gptr
*
)
&
opt_compatible_mode_str
,
(
gptr
*
)
&
opt_compatible_mode_str
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"compact"
,
OPT_COMPACT
,
"Give less verbose output (useful for debugging). Disables structure comments and header/footer constructs. Enables options --skip-add-drop-table --no-set-names --skip-disable-keys --skip-
lock-table
s"
,
"Give less verbose output (useful for debugging). Disables structure comments and header/footer constructs. Enables options --skip-add-drop-table --no-set-names --skip-disable-keys --skip-
add-lock
s"
,
(
gptr
*
)
&
opt_compact
,
(
gptr
*
)
&
opt_compact
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"complete-insert"
,
'c'
,
"Use complete insert statements."
,
(
gptr
*
)
&
cFlag
,
...
...
mysql-test/r/ctype_create.result
View file @
e2d4dc23
...
...
@@ -63,3 +63,12 @@ ERROR HY000: Conflicting declarations: 'CHARACTER SET latin1' and 'CHARACTER SET
create database d1 default character set latin1 collate latin2_bin;
ERROR 42000: COLLATION 'latin2_bin' is not valid for CHARACTER SET 'latin1'
DROP DATABASE mysqltest1;
CREATE DATABASE mysqltest2 DEFAULT CHARACTER SET latin7;
use mysqltest2;
ALTER DATABASE DEFAULT CHARACTER SET latin2;
show create database mysqltest2;
Database Create Database
mysqltest2 CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET latin2 */
drop database mysqltest2;
ALTER DATABASE DEFAULT CHARACTER SET latin2;
ERROR 3D000: No database selected
mysql-test/r/ctype_ucs.result
View file @
e2d4dc23
...
...
@@ -525,3 +525,59 @@ use test;
SET TIMESTAMP=10000;
insert into t2 values (@v);
drop table t2;
set names latin1;
create table t1 (a enum('x','y','z') character set ucs2);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` enum('x','y','z') character set ucs2 default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
insert into t1 values ('x');
insert into t1 values ('y');
insert into t1 values ('z');
select a, hex(a) from t1 order by a;
a hex(a)
x 0078
y 0079
z 007A
alter table t1 change a a enum('x','y','z','d','e','','','') character set ucs2;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` enum('x','y','z','d','e','','','') character set ucs2 default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
insert into t1 values ('D');
insert into t1 values ('E ');
insert into t1 values ('');
insert into t1 values ('');
insert into t1 values ('');
select a, hex(a) from t1 order by a;
a hex(a)
x 0078
y 0079
z 007A
d 0064
e 0065
00E4
00F6
00FC
drop table t1;
create table t1 (a set ('x','y','z','','','') character set ucs2);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` set('x','y','z','','','') character set ucs2 default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
insert into t1 values ('x');
insert into t1 values ('y');
insert into t1 values ('z');
insert into t1 values ('x,y');
insert into t1 values ('x,y,z,,,');
select a, hex(a) from t1 order by a;
a hex(a)
x 0078
y 0079
x,y 0078002C0079
z 007A
x,y,z,,, 0078002C0079002C007A002C00E4002C00F6002C00FC
drop table t1;
mysql-test/t/ctype_create.test
View file @
e2d4dc23
...
...
@@ -86,3 +86,15 @@ create database d1 default character set latin1 collate latin2_bin;
#
#
DROP
DATABASE
mysqltest1
;
#
# Synatx: 'ALTER DATABASE' without db_name
#
CREATE
DATABASE
mysqltest2
DEFAULT
CHARACTER
SET
latin7
;
use
mysqltest2
;
ALTER
DATABASE
DEFAULT
CHARACTER
SET
latin2
;
show
create
database
mysqltest2
;
drop
database
mysqltest2
;
--
error
1046
ALTER
DATABASE
DEFAULT
CHARACTER
SET
latin2
;
mysql-test/t/ctype_ucs.test
View file @
e2d4dc23
...
...
@@ -343,3 +343,34 @@ show binlog events from 79;
--
replace_result
$MYSQL_TEST_DIR
MYSQL_TEST_DIR
--
exec
$MYSQL_BINLOG
--
short
-
form
$MYSQL_TEST_DIR
/
var
/
log
/
master
-
bin
.
000001
drop
table
t2
;
#
# Check that ucs2 works with ENUM and SET type
#
set
names
latin1
;
create
table
t1
(
a
enum
(
'x'
,
'y'
,
'z'
)
character
set
ucs2
);
show
create
table
t1
;
insert
into
t1
values
(
'x'
);
insert
into
t1
values
(
'y'
);
insert
into
t1
values
(
'z'
);
select
a
,
hex
(
a
)
from
t1
order
by
a
;
alter
table
t1
change
a
a
enum
(
'x'
,
'y'
,
'z'
,
'd'
,
'e'
,
''
,
''
,
''
)
character
set
ucs2
;
show
create
table
t1
;
insert
into
t1
values
(
'D'
);
insert
into
t1
values
(
'E '
);
insert
into
t1
values
(
''
);
insert
into
t1
values
(
''
);
insert
into
t1
values
(
''
);
select
a
,
hex
(
a
)
from
t1
order
by
a
;
drop
table
t1
;
create
table
t1
(
a
set
(
'x'
,
'y'
,
'z'
,
''
,
''
,
''
)
character
set
ucs2
);
show
create
table
t1
;
insert
into
t1
values
(
'x'
);
insert
into
t1
values
(
'y'
);
insert
into
t1
values
(
'z'
);
insert
into
t1
values
(
'x,y'
);
insert
into
t1
values
(
'x,y,z,,,'
);
select
a
,
hex
(
a
)
from
t1
order
by
a
;
drop
table
t1
;
mysql-test/t/ps_1general.test
View file @
e2d4dc23
...
...
@@ -294,12 +294,14 @@ execute stmt4;
prepare
stmt4
from
' show table status from test like ''t2%'' '
;
# egalize date and time values
--
replace_column
12
# 13 # 14 #
--
replace_result
2147483647
64424509439
# Bug#4288 : prepared statement 'show table status ..', wrong output on execute
execute
stmt4
;
# try the same with the big table
prepare
stmt4
from
' show table status from test like ''t9%'' '
;
# egalize date and time values
--
replace_column
12
# 13 # 14 #
--
replace_result
2147483647
4294967295
# Bug#4288
execute
stmt4
;
prepare
stmt4
from
' show status like ''Threads_running'' '
;
...
...
scripts/fill_help_tables.sh
View file @
e2d4dc23
...
...
@@ -454,10 +454,12 @@ sub print_verbose_errors
print STDERR
"number of help keywords - "
,
$count_keywords
,
"
\n
"
;
my
$count_without_help
=
scalar
(
@without_help
)
;
my
$percent_without_help
=
$count_lex
?
int
((
$count_without_help
/
$count_lex
)
*
100
)
:
"100"
;
print_bad_names
(
\@
without_help,
"lexems without help ("
.
$count_without_help
.
" ~ "
.
(
int
((
$count_without_help
/
$count_lex
)
*
100
))
.
"%)"
)
;
$percent_without_help
.
"%)"
)
;
print_bad_names
(
\@
description_with_at,
" topics below have symbol
\'
@
\'
in their descriptions.
\n
"
.
"it's probably the litter from 'texi' tags (script needs fixing)"
)
;
...
...
@@ -467,10 +469,12 @@ sub print_verbose_errors
print_bad_names
(
\@
without_description,
"topics without description"
)
;
my
$count_without_example
=
scalar
(
@without_example
)
;
my
$percent_without_example
=
$count_topics
?
int
((
$count_without_example
/
$count_topics
)
*
100
)
:
"100"
;
print_bad_names
(
\@
without_example,
"topics without example ("
.
$count_without_example
.
" ~ "
.
(
int
((
$count_without_example
/
$count_topics
)
*
100
))
.
"%)"
)
;
$percent_without_example
.
"%)"
)
;
}
print_verbose_errors
if
(
$verbose_option
ne 0
)
;
...
...
scripts/mysql_install_db.sh
View file @
e2d4dc23
...
...
@@ -213,7 +213,7 @@ then
fi
mysqld_install_cmd_line
=
"
$mysqld
$defaults
$mysqld_opt
--bootstrap
\
--skip-grant-tables --basedir=
$basedir
--datadir=
$ldata
--skip-innodb
\
--skip-bdb --skip-ndbcluster
$args
--max_allowed_packet=8M"
--skip-bdb --skip-ndbcluster
$args
--max_allowed_packet=8M
--net_buffer_length=16K
"
if
$scriptdir
/mysql_create_system_tables
$create_option
$mdata
$hostname
$windows
\
|
eval
"
$mysqld_install_cmd_line
"
then
...
...
sql/field.cc
View file @
e2d4dc23
...
...
@@ -5529,8 +5529,7 @@ int Field_enum::store(const char *from,uint length,CHARSET_INFO *cs)
}
/* Remove end space */
while
(
length
>
0
&&
my_isspace
(
system_charset_info
,
from
[
length
-
1
]))
length
--
;
length
=
field_charset
->
cset
->
lengthsp
(
field_charset
,
from
,
length
);
uint
tmp
=
find_type2
(
typelib
,
from
,
length
,
field_charset
);
if
(
!
tmp
)
{
...
...
@@ -5632,7 +5631,7 @@ String *Field_enum::val_str(String *val_buffer __attribute__((unused)),
val_ptr
->
set
(
""
,
0
,
field_charset
);
else
val_ptr
->
set
((
const
char
*
)
typelib
->
type_names
[
tmp
-
1
],
(
uint
)
strlen
(
typelib
->
type_names
[
tmp
-
1
])
,
typelib
->
type_lengths
[
tmp
-
1
]
,
field_charset
);
return
val_ptr
;
}
...
...
@@ -5669,13 +5668,14 @@ void Field_enum::sql_type(String &res) const
res
.
append
(
"enum("
);
bool
flag
=
0
;
for
(
const
char
**
pos
=
typelib
->
type_names
;
*
pos
;
pos
++
)
uint
*
len
=
typelib
->
type_lengths
;
for
(
const
char
**
pos
=
typelib
->
type_names
;
*
pos
;
pos
++
,
len
++
)
{
uint
dummy_errors
;
if
(
flag
)
res
.
append
(
','
);
/* convert to res.charset() == utf8, then quote */
enum_item
.
copy
(
*
pos
,
strlen
(
*
pos
)
,
charset
(),
res
.
charset
(),
&
dummy_errors
);
enum_item
.
copy
(
*
pos
,
*
len
,
charset
(),
res
.
charset
(),
&
dummy_errors
);
append_unescaped
(
&
res
,
enum_item
.
ptr
(),
enum_item
.
length
());
flag
=
1
;
}
...
...
@@ -5760,9 +5760,9 @@ String *Field_set::val_str(String *val_buffer,
if
(
tmp
&
1
)
{
if
(
val_buffer
->
length
())
val_buffer
->
append
(
field_separator
);
val_buffer
->
append
(
&
field_separator
,
1
,
&
my_charset_latin1
);
String
str
(
typelib
->
type_names
[
bitnr
],
(
uint
)
strlen
(
typelib
->
type_names
[
bitnr
])
,
typelib
->
type_lengths
[
bitnr
]
,
field_charset
);
val_buffer
->
append
(
str
);
}
...
...
@@ -5782,13 +5782,14 @@ void Field_set::sql_type(String &res) const
res
.
append
(
"set("
);
bool
flag
=
0
;
for
(
const
char
**
pos
=
typelib
->
type_names
;
*
pos
;
pos
++
)
uint
*
len
=
typelib
->
type_lengths
;
for
(
const
char
**
pos
=
typelib
->
type_names
;
*
pos
;
pos
++
,
len
++
)
{
uint
dummy_errors
;
if
(
flag
)
res
.
append
(
','
);
/* convert to res.charset() == utf8, then quote */
set_item
.
copy
(
*
pos
,
strlen
(
*
pos
)
,
charset
(),
res
.
charset
(),
&
dummy_errors
);
set_item
.
copy
(
*
pos
,
*
len
,
charset
(),
res
.
charset
(),
&
dummy_errors
);
append_unescaped
(
&
res
,
set_item
.
ptr
(),
set_item
.
length
());
flag
=
1
;
}
...
...
sql/item_strfunc.cc
View file @
e2d4dc23
...
...
@@ -2320,17 +2320,6 @@ String *Item_func_hex::val_str(String *str)
return
&
tmp_value
;
}
inline
int
hexchar_to_int
(
char
c
)
{
if
(
c
<=
'9'
&&
c
>=
'0'
)
return
c
-
'0'
;
c
|=
32
;
if
(
c
<=
'f'
&&
c
>=
'a'
)
return
c
-
'a'
+
10
;
return
-
1
;
}
/* Convert given hex string to a binary string */
String
*
Item_func_unhex
::
val_str
(
String
*
str
)
...
...
sql/mysql_priv.h
View file @
e2d4dc23
...
...
@@ -1200,6 +1200,23 @@ inline void setup_table_map(TABLE *table, TABLE_LIST *table_list, uint tablenr)
}
/*
SYNOPSYS
hexchar_to_int()
convert a hex digit into number
*/
inline
int
hexchar_to_int
(
char
c
)
{
if
(
c
<=
'9'
&&
c
>=
'0'
)
return
c
-
'0'
;
c
|=
32
;
if
(
c
<=
'f'
&&
c
>=
'a'
)
return
c
-
'a'
+
10
;
return
-
1
;
}
/*
Some functions that are different in the embedded library and the normal
server
...
...
sql/net_serv.cc
View file @
e2d4dc23
...
...
@@ -165,8 +165,8 @@ my_bool net_realloc(NET *net, ulong length)
if
(
length
>=
net
->
max_packet_size
)
{
DBUG_PRINT
(
"error"
,
(
"Packet too large. Max six
e: %lu"
,
net
->
max_packet_size
));
DBUG_PRINT
(
"error"
,
(
"Packet too large. Max siz
e: %lu"
,
net
->
max_packet_size
));
net
->
error
=
1
;
net
->
report_error
=
1
;
net
->
last_errno
=
ER_NET_PACKET_TOO_LARGE
;
...
...
sql/sql_parse.cc
View file @
e2d4dc23
...
...
@@ -1102,13 +1102,25 @@ extern "C" pthread_handler_decl(handle_bootstrap,arg)
thd
->
init_for_queries
();
while
(
fgets
(
buff
,
thd
->
net
.
max_packet
,
file
))
{
u
int
length
=
(
uint
)
strlen
(
buff
);
if
(
buff
[
length
-
1
]
!=
'\n'
&&
!
feof
(
file
))
u
long
length
=
(
ulong
)
strlen
(
buff
);
while
(
buff
[
length
-
1
]
!=
'\n'
&&
!
feof
(
file
))
{
send_error
(
thd
,
ER_NET_PACKET_TOO_LARGE
,
NullS
);
thd
->
fatal_error
();
break
;
/*
We got only a part of the current string. Will try to increase
net buffer then read the rest of the current string.
*/
if
(
net_realloc
(
&
(
thd
->
net
),
2
*
thd
->
net
.
max_packet
))
{
send_error
(
thd
,
thd
->
net
.
last_errno
,
NullS
);
thd
->
is_fatal_error
=
1
;
break
;
}
buff
=
(
char
*
)
thd
->
net
.
buff
;
fgets
(
buff
+
length
,
thd
->
net
.
max_packet
-
length
,
file
);
length
+=
(
ulong
)
strlen
(
buff
+
length
);
}
if
(
thd
->
is_fatal_error
)
break
;
while
(
length
&&
(
my_isspace
(
thd
->
charset
(),
buff
[
length
-
1
])
||
buff
[
length
-
1
]
==
';'
))
length
--
;
...
...
@@ -3184,9 +3196,15 @@ purposes internal to the MySQL server", MYF(0));
}
case
SQLCOM_ALTER_DB
:
{
if
(
!
strip_sp
(
lex
->
name
)
||
check_db_name
(
lex
->
name
))
char
*
db
=
lex
->
name
?
lex
->
name
:
thd
->
db
;
if
(
!
db
)
{
net_printf
(
thd
,
ER_WRONG_DB_NAME
,
lex
->
name
);
send_error
(
thd
,
ER_NO_DB_ERROR
);
goto
error
;
}
if
(
!
strip_sp
(
db
)
||
check_db_name
(
db
))
{
net_printf
(
thd
,
ER_WRONG_DB_NAME
,
db
);
break
;
}
/*
...
...
@@ -3198,21 +3216,21 @@ purposes internal to the MySQL server", MYF(0));
*/
#ifdef HAVE_REPLICATION
if
(
thd
->
slave_thread
&&
(
!
db_ok
(
lex
->
name
,
replicate_do_db
,
replicate_ignore_db
)
||
!
db_ok_with_wild_table
(
lex
->
name
)))
(
!
db_ok
(
db
,
replicate_do_db
,
replicate_ignore_db
)
||
!
db_ok_with_wild_table
(
db
)))
{
my_error
(
ER_SLAVE_IGNORED_TABLE
,
MYF
(
0
));
break
;
}
#endif
if
(
check_access
(
thd
,
ALTER_ACL
,
lex
->
name
,
0
,
1
,
0
))
if
(
check_access
(
thd
,
ALTER_ACL
,
db
,
0
,
1
,
0
))
break
;
if
(
thd
->
locked_tables
||
thd
->
active_transaction
())
{
send_error
(
thd
,
ER_LOCK_OR_ACTIVE_TRANSACTION
);
goto
error
;
}
res
=
mysql_alter_db
(
thd
,
lex
->
name
,
&
lex
->
create_info
);
res
=
mysql_alter_db
(
thd
,
db
,
&
lex
->
create_info
);
break
;
}
case
SQLCOM_SHOW_CREATE_DB
:
...
...
sql/sql_yacc.yy
View file @
e2d4dc23
...
...
@@ -609,7 +609,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%type <simple_string>
remember_name remember_end opt_ident opt_db text_or_password
opt_constraint constraint
opt_constraint constraint
ident_or_empty
%type <string>
text_string opt_gconcat_separator
...
...
@@ -1870,7 +1870,7 @@ alter:
}
alter_list
{}
| ALTER DATABASE ident
| ALTER DATABASE ident
_or_empty
{
Lex->create_info.default_table_charset= NULL;
Lex->create_info.used_fields= 0;
...
...
@@ -1879,10 +1879,15 @@ alter:
{
LEX *lex=Lex;
lex->sql_command=SQLCOM_ALTER_DB;
lex->name=
$3.str
;
lex->name=
$3
;
};
ident_or_empty:
/* empty */ { $$= 0; }
| ident { $$= $1.str; };
alter_list:
| DISCARD TABLESPACE { Lex->alter_info.tablespace_op= DISCARD_TABLESPACE; }
| IMPORT TABLESPACE { Lex->alter_info.tablespace_op= IMPORT_TABLESPACE; }
...
...
sql/strfunc.cc
View file @
e2d4dc23
...
...
@@ -53,8 +53,22 @@ ulonglong find_set(TYPELIB *lib, const char *str, uint length, CHARSET_INFO *cs,
{
const
char
*
pos
=
start
;
uint
var_len
;
int
mblen
=
1
;
for
(;
pos
!=
end
&&
*
pos
!=
field_separator
;
pos
++
)
;
if
(
cs
&&
cs
->
mbminlen
>
1
)
{
for
(
;
pos
<
end
;
pos
+=
mblen
)
{
my_wc_t
wc
;
if
((
mblen
=
cs
->
cset
->
mb_wc
(
cs
,
&
wc
,
(
const
uchar
*
)
pos
,
(
const
uchar
*
)
end
))
<
1
)
mblen
=
1
;
// Not to hang on a wrong multibyte sequence
if
(
wc
==
(
my_wc_t
)
field_separator
)
break
;
}
}
else
for
(;
pos
!=
end
&&
*
pos
!=
field_separator
;
pos
++
)
;
var_len
=
(
uint
)
(
pos
-
start
);
uint
find
=
cs
?
find_type2
(
lib
,
start
,
var_len
,
cs
)
:
find_type
(
lib
,
start
,
var_len
,
(
bool
)
0
);
...
...
@@ -66,9 +80,9 @@ ulonglong find_set(TYPELIB *lib, const char *str, uint length, CHARSET_INFO *cs,
}
else
found
|=
((
longlong
)
1
<<
(
find
-
1
));
if
(
pos
=
=
end
)
if
(
pos
>
=
end
)
break
;
start
=
pos
+
1
;
start
=
pos
+
mblen
;
}
}
return
found
;
...
...
sql/table.cc
View file @
e2d4dc23
...
...
@@ -485,6 +485,23 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
charset
=
outparam
->
table_charset
;
bzero
((
char
*
)
&
comment
,
sizeof
(
comment
));
}
if
(
interval_nr
&&
charset
->
mbminlen
>
1
)
{
/* Unescape UCS2 intervals from HEX notation */
TYPELIB
*
interval
=
outparam
->
intervals
+
interval_nr
-
1
;
for
(
uint
pos
=
0
;
pos
<
interval
->
count
;
pos
++
)
{
char
*
from
,
*
to
;
for
(
from
=
to
=
(
char
*
)
interval
->
type_names
[
pos
];
*
from
;
)
{
*
to
++=
(
char
)
(
hexchar_to_int
(
*
from
++
)
<<
4
)
+
hexchar_to_int
(
*
from
++
);
}
interval
->
type_lengths
[
pos
]
/=
2
;
}
}
*
field_ptr
=
reg_field
=
make_field
(
record
+
recpos
,
(
uint32
)
field_length
,
...
...
sql/unireg.cc
View file @
e2d4dc23
...
...
@@ -423,6 +423,28 @@ static bool pack_header(uchar *forminfo, enum db_type table_type,
if
(
field
->
interval
)
{
uint
old_int_count
=
int_count
;
if
(
field
->
charset
->
mbminlen
>
1
)
{
/* Escape UCS2 intervals using HEX notation */
for
(
uint
pos
=
0
;
pos
<
field
->
interval
->
count
;
pos
++
)
{
char
*
dst
;
uint
length
=
field
->
interval
->
type_lengths
[
pos
],
hex_length
;
const
char
*
src
=
field
->
interval
->
type_names
[
pos
];
const
char
*
srcend
=
src
+
length
;
hex_length
=
length
*
2
;
field
->
interval
->
type_lengths
[
pos
]
=
hex_length
;
field
->
interval
->
type_names
[
pos
]
=
dst
=
sql_alloc
(
hex_length
+
1
);
for
(
;
src
<
srcend
;
src
++
)
{
*
dst
++=
_dig_vec_upper
[((
uchar
)
*
src
)
>>
4
];
*
dst
++=
_dig_vec_upper
[((
uchar
)
*
src
)
&
15
];
}
*
dst
=
'\0'
;
}
}
field
->
interval_id
=
get_interval_id
(
&
int_count
,
create_fields
,
field
);
if
(
old_int_count
!=
int_count
)
{
...
...
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