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
c8bc42cc
Commit
c8bc42cc
authored
Jan 12, 2007
by
tnurnberg@sin.azundris.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/home/tnurnberg/work/mysql-5.1-maint-24660
parents
2706b3d7
34122240
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
89 additions
and
33 deletions
+89
-33
mysql-test/r/type_enum.result
mysql-test/r/type_enum.result
+26
-0
mysql-test/t/type_enum.test
mysql-test/t/type_enum.test
+23
-1
sql/table.cc
sql/table.cc
+0
-11
sql/unireg.cc
sql/unireg.cc
+40
-21
No files found.
mysql-test/r/type_enum.result
View file @
c8bc42cc
...
...
@@ -1754,3 +1754,29 @@ t1 CREATE TABLE `t1` (
`f2` enum('') DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
End of 4.1 tests
create table t1(russian enum('E','F','EF','FE') NOT NULL DEFAULT'E');
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`russian` enum('E','F','EF','FE') NOT NULL DEFAULT 'E'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
create table t1(denormal enum('E','F','E,F','F,E') NOT NULL DEFAULT'E');
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`denormal` enum('E','F','E,F','F,E') NOT NULL DEFAULT 'E'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
create table t1(russian_deviant enum('E','F','EF','F,E') NOT NULL DEFAULT'E');
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`russian_deviant` enum('E','F','EF','F,E') NOT NULL DEFAULT 'E'
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
create table t1(exhausting_charset enum('ABCDEFGHIJKLMNOPQRSTUVWXYZ','
!"','#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~','xx\','yy\','zz'));
ERROR 42000: Field separator argument is not what is expected; check the manual
End of 5.1 tests
...
...
mysql-test/t/type_enum.test
View file @
c8bc42cc
...
...
@@ -136,4 +136,26 @@ alter table t1 add f2 enum(0xFFFF);
show
create
table
t1
;
drop
table
t1
;
# End of 4.1 tests
--
echo
End
of
4.1
tests
#
# Bug#24660 "enum" field type definition problem
#
create
table
t1
(
russian
enum
(
'E'
,
'F'
,
'EF'
,
'FE'
)
NOT
NULL
DEFAULT
'E'
);
show
create
table
t1
;
drop
table
t1
;
create
table
t1
(
denormal
enum
(
'E'
,
'F'
,
'E,F'
,
'F,E'
)
NOT
NULL
DEFAULT
'E'
);
show
create
table
t1
;
drop
table
t1
;
create
table
t1
(
russian_deviant
enum
(
'E'
,
'F'
,
'EF'
,
'F,E'
)
NOT
NULL
DEFAULT
'E'
);
show
create
table
t1
;
drop
table
t1
;
# ER_WRONG_FIELD_TERMINATORS
--
error
1083
create
table
t1
(
exhausting_charset
enum
(
'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
,
'
!"'
,
'#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~'
,
'xx\'
,
'yy\','
zz
'
));
--
echo
End
of
5.1
tests
...
...
sql/table.cc
View file @
c8bc42cc
...
...
@@ -803,17 +803,6 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
{
char
*
val
=
(
char
*
)
interval
->
type_names
[
count
];
interval
->
type_lengths
[
count
]
=
strlen
(
val
);
/*
Replace all ',' symbols with NAMES_SEP_CHAR.
See the comment in unireg.cc, pack_fields() function
for details.
*/
for
(
uint
cnt
=
0
;
cnt
<
interval
->
type_lengths
[
count
]
;
cnt
++
)
{
char
c
=
val
[
cnt
];
if
(
c
==
','
)
val
[
cnt
]
=
NAMES_SEP_CHAR
;
}
}
interval
->
type_lengths
[
count
]
=
0
;
}
...
...
sql/unireg.cc
View file @
c8bc42cc
...
...
@@ -788,29 +788,48 @@ static bool pack_fields(File file, List<create_field> &create_fields,
{
if
(
field
->
interval_id
>
int_count
)
{
int_count
=
field
->
interval_id
;
tmp
.
append
(
NAMES_SEP_CHAR
);
for
(
const
char
**
pos
=
field
->
interval
->
type_names
;
*
pos
;
pos
++
)
{
char
*
val
=
(
char
*
)
*
pos
;
uint
str_len
=
strlen
(
val
);
/*
Note, hack: in old frm NAMES_SEP_CHAR is used to separate
names in the interval (ENUM/SET). To allow names to contain
NAMES_SEP_CHAR, we replace it with a comma before writing frm.
Backward conversion is done during frm file opening,
See table.cc, openfrm() function
*/
for
(
uint
cnt
=
0
;
cnt
<
str_len
;
cnt
++
)
unsigned
char
sep
=
0
;
unsigned
char
occ
[
256
];
uint
i
;
unsigned
char
*
val
=
NULL
;
bzero
(
occ
,
sizeof
(
occ
));
for
(
i
=
0
;
(
val
=
(
unsigned
char
*
)
field
->
interval
->
type_names
[
i
]);
i
++
)
for
(
uint
j
=
0
;
j
<
field
->
interval
->
type_lengths
[
i
];
j
++
)
occ
[(
unsigned
int
)
(
val
[
j
])]
=
1
;
if
(
!
occ
[(
unsigned
char
)
NAMES_SEP_CHAR
])
sep
=
(
unsigned
char
)
NAMES_SEP_CHAR
;
else
if
(
!
occ
[(
unsigned
int
)
','
])
sep
=
','
;
else
{
for
(
uint
i
=
1
;
i
<
256
;
i
++
)
{
if
(
!
occ
[
i
])
{
sep
=
i
;
break
;
}
}
if
(
!
sep
)
/* disaster, enum uses all characters, none left as separator */
{
char
c
=
val
[
cnt
];
if
(
c
==
NAMES_SEP_CHAR
)
val
[
cnt
]
=
','
;
my_message
(
ER_WRONG_FIELD_TERMINATORS
,
ER
(
ER_WRONG_FIELD_TERMINATORS
),
MYF
(
0
));
DBUG_RETURN
(
1
)
;
}
tmp
.
append
(
*
pos
);
tmp
.
append
(
NAMES_SEP_CHAR
);
}
tmp
.
append
(
'\0'
);
// End of intervall
}
int_count
=
field
->
interval_id
;
tmp
.
append
(
sep
);
for
(
const
char
**
pos
=
field
->
interval
->
type_names
;
*
pos
;
pos
++
)
{
tmp
.
append
(
*
pos
);
tmp
.
append
(
sep
);
}
tmp
.
append
(
'\0'
);
// End of intervall
}
}
if
(
my_write
(
file
,(
byte
*
)
tmp
.
ptr
(),
tmp
.
length
(),
MYF_RW
))
...
...
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