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
766673c8
Commit
766673c8
authored
Mar 17, 2003
by
Sinisa@sinisa.nasamreza.org
Browse files
Options
Browse Files
Download
Plain Diff
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
parents
c2cde480
1600a25a
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
636 additions
and
320 deletions
+636
-320
mysql-test/r/ctype_collate.result
mysql-test/r/ctype_collate.result
+3
-3
mysql-test/r/ctype_many.result
mysql-test/r/ctype_many.result
+479
-193
mysql-test/t/ctype_many.test
mysql-test/t/ctype_many.test
+9
-1
mysys/charset.c
mysys/charset.c
+1
-1
sql/item.cc
sql/item.cc
+13
-9
sql/item.h
sql/item.h
+3
-3
sql/item_cmpfunc.cc
sql/item_cmpfunc.cc
+3
-3
sql/item_func.cc
sql/item_func.cc
+3
-3
sql/item_strfunc.cc
sql/item_strfunc.cc
+2
-53
sql/mysqld.cc
sql/mysqld.cc
+0
-1
sql/protocol.cc
sql/protocol.cc
+11
-6
sql/sql_string.cc
sql/sql_string.cc
+1
-1
sql/sql_yacc.yy
sql/sql_yacc.yy
+104
-43
strings/ctype-utf8.c
strings/ctype-utf8.c
+4
-0
No files found.
mysql-test/r/ctype_collate.result
View file @
766673c8
...
@@ -545,21 +545,21 @@ Variable_name Value
...
@@ -545,21 +545,21 @@ Variable_name Value
client_collation koi8r
client_collation koi8r
SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
charset('a') collation('a') coercibility('a') 'a'='A'
charset('a') collation('a') coercibility('a') 'a'='A'
koi8r koi8r
2 1
latin1 latin1
2 1
SET COLLATION koi8r_bin;
SET COLLATION koi8r_bin;
SHOW VARIABLES LIKE 'client_collation';
SHOW VARIABLES LIKE 'client_collation';
Variable_name Value
Variable_name Value
client_collation koi8r_bin
client_collation koi8r_bin
SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
charset('a') collation('a') coercibility('a') 'a'='A'
charset('a') collation('a') coercibility('a') 'a'='A'
koi8r koi8r_bin 2 0
latin1 latin1 2 1
SET COLLATION DEFAULT;
SET COLLATION DEFAULT;
SHOW VARIABLES LIKE 'client_collation';
SHOW VARIABLES LIKE 'client_collation';
Variable_name Value
Variable_name Value
client_collation koi8r
client_collation koi8r
SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
SELECT charset('a'),collation('a'),coercibility('a'),'a'='A';
charset('a') collation('a') coercibility('a') 'a'='A'
charset('a') collation('a') coercibility('a') 'a'='A'
koi8r koi8r
2 1
latin1 latin1
2 1
SET NAMES DEFAULT;
SET NAMES DEFAULT;
SHOW VARIABLES LIKE 'client_collation';
SHOW VARIABLES LIKE 'client_collation';
Variable_name Value
Variable_name Value
...
...
mysql-test/r/ctype_many.result
View file @
766673c8
No preview for this file type
mysql-test/t/ctype_many.test
View file @
766673c8
...
@@ -2,6 +2,8 @@
...
@@ -2,6 +2,8 @@
DROP
TABLE
IF
EXISTS
t1
;
DROP
TABLE
IF
EXISTS
t1
;
--
enable_warnings
--
enable_warnings
SET
NAMES
latin1
;
CREATE
TABLE
t1
(
CREATE
TABLE
t1
(
comment
CHAR
(
32
)
ASCII
NOT
NULL
,
comment
CHAR
(
32
)
ASCII
NOT
NULL
,
koi8_ru_f
CHAR
(
32
)
CHARACTER
SET
koi8r
NOT
NULL
koi8_ru_f
CHAR
(
32
)
CHARACTER
SET
koi8r
NOT
NULL
...
@@ -135,10 +137,12 @@ INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'
...
@@ -135,10 +137,12 @@ INSERT INTO t1 (koi8_ru_f,comment) VALUES (_koi8r'
INSERT
INTO
t1
(
koi8_ru_f
,
comment
)
VALUES
(
_koi8r
''
,
'CYR CAPIT YU'
);
INSERT
INTO
t1
(
koi8_ru_f
,
comment
)
VALUES
(
_koi8r
''
,
'CYR CAPIT YU'
);
INSERT
INTO
t1
(
koi8_ru_f
,
comment
)
VALUES
(
_koi8r
''
,
'CYR CAPIT YA'
);
INSERT
INTO
t1
(
koi8_ru_f
,
comment
)
VALUES
(
_koi8r
''
,
'CYR CAPIT YA'
);
SELECT
CONVERT
(
koi8_ru_f
USING
utf8
),
MIN
(
comment
),
COUNT
(
*
)
FROM
t1
GROUP
BY
1
;
SET
NAMES
utf8
;
SELECT
koi8_ru_f
,
MIN
(
comment
),
COUNT
(
*
)
FROM
t1
GROUP
BY
1
;
ALTER
TABLE
t1
ADD
utf8_f
CHAR
(
32
)
CHARACTER
SET
utf8
NOT
NULL
;
ALTER
TABLE
t1
ADD
utf8_f
CHAR
(
32
)
CHARACTER
SET
utf8
NOT
NULL
;
UPDATE
t1
SET
utf8_f
=
CONVERT
(
koi8_ru_f
USING
utf8
);
UPDATE
t1
SET
utf8_f
=
CONVERT
(
koi8_ru_f
USING
utf8
);
SET
NAMES
koi8r
;
SELECT
*
FROM
t1
;
SELECT
*
FROM
t1
;
ALTER
TABLE
t1
ADD
bin_f
CHAR
(
32
)
BYTE
NOT
NULL
;
ALTER
TABLE
t1
ADD
bin_f
CHAR
(
32
)
BYTE
NOT
NULL
;
...
@@ -161,6 +165,7 @@ FROM t1 t11,t1 t12
...
@@ -161,6 +165,7 @@ FROM t1 t11,t1 t12
WHERE
t11
.
koi8_ru_f
=
CONVERT
(
t12
.
utf8_f
USING
koi8r
)
WHERE
t11
.
koi8_ru_f
=
CONVERT
(
t12
.
utf8_f
USING
koi8r
)
ORDER
BY
t12
.
utf8_f
,
t11
.
comment
,
t12
.
comment
;
ORDER
BY
t12
.
utf8_f
,
t11
.
comment
,
t12
.
comment
;
SET
NAMES
utf8
;
ALTER
TABLE
t1
ADD
ucs2_f
CHAR
(
32
)
CHARACTER
SET
ucs2
;
ALTER
TABLE
t1
ADD
ucs2_f
CHAR
(
32
)
CHARACTER
SET
ucs2
;
ALTER
TABLE
t1
CHANGE
ucs2_f
ucs2_f
CHAR
(
32
)
UNICODE
NOT
NULL
;
ALTER
TABLE
t1
CHANGE
ucs2_f
ucs2_f
CHAR
(
32
)
UNICODE
NOT
NULL
;
...
@@ -193,5 +198,8 @@ UPDATE t1 SET greek_f=CONVERT(ucs2_f USING greek) WHERE comment LIKE 'GRE%';
...
@@ -193,5 +198,8 @@ UPDATE t1 SET greek_f=CONVERT(ucs2_f USING greek) WHERE comment LIKE 'GRE%';
UPDATE
t1
SET
armscii8_f
=
CONVERT
(
ucs2_f
USING
armscii8
)
WHERE
comment
LIKE
'ARM%'
;
UPDATE
t1
SET
armscii8_f
=
CONVERT
(
ucs2_f
USING
armscii8
)
WHERE
comment
LIKE
'ARM%'
;
UPDATE
t1
SET
utf8_f
=
CONVERT
(
ucs2_f
USING
utf8
)
WHERE
utf8_f
=
''
;
UPDATE
t1
SET
utf8_f
=
CONVERT
(
ucs2_f
USING
utf8
)
WHERE
utf8_f
=
''
;
UPDATE
t1
SET
ucs2_f
=
CONVERT
(
utf8_f
USING
ucs2
)
WHERE
ucs2_f
=
''
;
UPDATE
t1
SET
ucs2_f
=
CONVERT
(
utf8_f
USING
ucs2
)
WHERE
ucs2_f
=
''
;
SELECT
*
FROM
t1
;
SET
NAMES
'binary'
;
SELECT
*
FROM
t1
;
SELECT
min
(
comment
),
count
(
*
)
FROM
t1
GROUP
BY
ucs2_f
;
SELECT
min
(
comment
),
count
(
*
)
FROM
t1
GROUP
BY
ucs2_f
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
mysys/charset.c
View file @
766673c8
...
@@ -324,7 +324,7 @@ static int add_collation(CHARSET_INFO *cs)
...
@@ -324,7 +324,7 @@ static int add_collation(CHARSET_INFO *cs)
if
(
cs
->
primary_number
==
cs
->
number
)
if
(
cs
->
primary_number
==
cs
->
number
)
cs
->
state
|=
MY_CS_PRIMARY
;
cs
->
state
|=
MY_CS_PRIMARY
;
if
(
cs
->
prim
ary_number
==
cs
->
number
)
if
(
cs
->
bin
ary_number
==
cs
->
number
)
cs
->
state
|=
MY_CS_BINSORT
;
cs
->
state
|=
MY_CS_BINSORT
;
if
(
!
(
all_charsets
[
cs
->
number
]
->
state
&
MY_CS_COMPILED
))
if
(
!
(
all_charsets
[
cs
->
number
]
->
state
&
MY_CS_COMPILED
))
...
...
sql/item.cc
View file @
766673c8
...
@@ -90,19 +90,23 @@ bool Item::check_cols(uint c)
...
@@ -90,19 +90,23 @@ bool Item::check_cols(uint c)
return
0
;
return
0
;
}
}
void
Item
::
set_name
(
const
char
*
str
,
uint
length
)
void
Item
::
set_name
(
const
char
*
str
,
uint
length
,
CHARSET_INFO
*
cs
)
{
{
if
(
!
length
)
if
(
!
length
)
name
=
(
char
*
)
str
;
// Used by AS
length
=
str
?
strlen
(
str
)
:
0
;
else
while
(
length
&&
!
my_isgraph
(
cs
,
*
str
))
{
while
(
length
&&
!
my_isgraph
(
system_charset_info
,
*
str
))
{
// Fix problem with yacc
{
// Fix problem with yacc
length
--
;
length
--
;
str
++
;
str
++
;
}
}
name
=
sql_strmake
(
str
,
min
(
length
,
MAX_FIELD_WIDTH
));
if
(
!
my_charset_same
(
cs
,
system_charset_info
))
{
String
tmp
;
tmp
.
copy
(
str
,
length
,
cs
,
system_charset_info
);
name
=
sql_strmake
(
tmp
.
ptr
(),
min
(
tmp
.
length
(),
MAX_FIELD_WIDTH
));
}
}
else
name
=
sql_strmake
(
str
,
min
(
length
,
MAX_FIELD_WIDTH
));
}
}
/*
/*
...
...
sql/item.h
View file @
766673c8
...
@@ -63,7 +63,7 @@ class Item {
...
@@ -63,7 +63,7 @@ class Item {
*/
*/
Item
(
THD
*
thd
,
Item
&
item
);
Item
(
THD
*
thd
,
Item
&
item
);
virtual
~
Item
()
{
name
=
0
;
}
/*lint -e1509 */
virtual
~
Item
()
{
name
=
0
;
}
/*lint -e1509 */
void
set_name
(
const
char
*
str
,
uint
length
=
0
);
void
set_name
(
const
char
*
str
,
uint
length
,
CHARSET_INFO
*
cs
);
void
init_make_field
(
Send_field
*
tmp_field
,
enum
enum_field_types
type
);
void
init_make_field
(
Send_field
*
tmp_field
,
enum
enum_field_types
type
);
virtual
void
make_field
(
Send_field
*
field
);
virtual
void
make_field
(
Send_field
*
field
);
virtual
bool
fix_fields
(
THD
*
,
struct
st_table_list
*
,
Item
**
);
virtual
bool
fix_fields
(
THD
*
,
struct
st_table_list
*
,
Item
**
);
...
@@ -359,7 +359,7 @@ class Item_string :public Item
...
@@ -359,7 +359,7 @@ class Item_string :public Item
str_value
.
set
(
str
,
length
,
cs
);
str_value
.
set
(
str
,
length
,
cs
);
coercibility
=
coer
;
coercibility
=
coer
;
max_length
=
length
;
max_length
=
length
;
name
=
(
char
*
)
str_value
.
ptr
(
);
set_name
(
str
,
length
,
cs
);
decimals
=
NOT_FIXED_DEC
;
decimals
=
NOT_FIXED_DEC
;
}
}
Item_string
(
const
char
*
name_par
,
const
char
*
str
,
uint
length
,
Item_string
(
const
char
*
name_par
,
const
char
*
str
,
uint
length
,
...
@@ -368,7 +368,7 @@ class Item_string :public Item
...
@@ -368,7 +368,7 @@ class Item_string :public Item
str_value
.
set
(
str
,
length
,
cs
);
str_value
.
set
(
str
,
length
,
cs
);
coercibility
=
coer
;
coercibility
=
coer
;
max_length
=
length
;
max_length
=
length
;
name
=
(
char
*
)
name_par
;
set_name
(
name_par
,
0
,
cs
)
;
decimals
=
NOT_FIXED_DEC
;
decimals
=
NOT_FIXED_DEC
;
}
}
~
Item_string
()
{}
~
Item_string
()
{}
...
...
sql/item_cmpfunc.cc
View file @
766673c8
...
@@ -124,10 +124,10 @@ void Item_bool_func2::fix_length_and_dec()
...
@@ -124,10 +124,10 @@ void Item_bool_func2::fix_length_and_dec()
}
}
}
}
}
}
set_cmp_func
();
/* QQ: COERCIBILITY */
/* QQ: COERCIBILITY */
cmp_charset
=
(
args
[
0
]
->
binary
()
||
args
[
1
]
->
binary
())
?
cmp_charset
=
(
args
[
0
]
->
binary
()
||
args
[
1
]
->
binary
())
?
&
my_charset_bin
:
args
[
0
]
->
charset
();
&
my_charset_bin
:
args
[
0
]
->
charset
();
set_cmp_func
();
}
}
...
...
sql/item_func.cc
View file @
766673c8
...
@@ -2641,7 +2641,7 @@ Item *get_system_var(enum_var_type var_type, LEX_STRING name)
...
@@ -2641,7 +2641,7 @@ Item *get_system_var(enum_var_type var_type, LEX_STRING name)
pos
=
strmov
(
pos
,
"global."
);
pos
=
strmov
(
pos
,
"global."
);
memcpy
(
pos
,
var
->
name
,
var
->
name_length
+
1
);
memcpy
(
pos
,
var
->
name
,
var
->
name_length
+
1
);
// set_name() will allocate the name
// set_name() will allocate the name
item
->
set_name
(
buff
,(
uint
)
(
pos
-
buff
)
+
var
->
name_length
);
item
->
set_name
(
buff
,(
uint
)
(
pos
-
buff
)
+
var
->
name_length
,
system_charset_info
);
return
item
;
return
item
;
}
}
...
@@ -2658,7 +2658,7 @@ Item *get_system_var(enum_var_type var_type, const char *var_name, uint length,
...
@@ -2658,7 +2658,7 @@ Item *get_system_var(enum_var_type var_type, const char *var_name, uint length,
if
(
!
(
item
=
var
->
item
(
thd
,
var_type
)))
if
(
!
(
item
=
var
->
item
(
thd
,
var_type
)))
return
0
;
// Impossible
return
0
;
// Impossible
thd
->
lex
.
uncacheable
();
thd
->
lex
.
uncacheable
();
item
->
set_name
(
item_name
);
// Will use original name
item
->
set_name
(
item_name
,
0
,
system_charset_info
);
// Will use original name
return
item
;
return
item
;
}
}
...
...
sql/item_strfunc.cc
View file @
766673c8
...
@@ -2015,65 +2015,14 @@ String *Item_func_conv::val_str(String *str)
...
@@ -2015,65 +2015,14 @@ String *Item_func_conv::val_str(String *str)
String
*
Item_func_conv_charset
::
val_str
(
String
*
str
)
String
*
Item_func_conv_charset
::
val_str
(
String
*
str
)
{
{
my_wc_t
wc
;
int
cnvres
;
const
uchar
*
s
,
*
se
;
uchar
*
d
,
*
d0
,
*
de
;
uint32
dmaxlen
;
String
*
arg
=
args
[
0
]
->
val_str
(
str
);
String
*
arg
=
args
[
0
]
->
val_str
(
str
);
CHARSET_INFO
*
from
,
*
to
;
if
(
!
arg
)
if
(
!
arg
)
{
{
null_value
=
1
;
null_value
=
1
;
return
0
;
return
0
;
}
}
null_value
=
0
;
null_value
=
str
->
copy
(
arg
->
ptr
(),
arg
->
length
(),
arg
->
charset
(),
conv_charset
);
return
null_value
?
0
:
str
;
from
=
arg
->
charset
();
to
=
conv_charset
;
s
=
(
const
uchar
*
)
arg
->
ptr
();
se
=
s
+
arg
->
length
();
dmaxlen
=
arg
->
length
()
*
to
->
mbmaxlen
+
1
;
str
->
alloc
(
dmaxlen
);
d0
=
d
=
(
unsigned
char
*
)
str
->
ptr
();
de
=
d
+
dmaxlen
;
while
(
1
)
{
cnvres
=
from
->
mb_wc
(
from
,
&
wc
,
s
,
se
);
if
(
cnvres
>
0
)
{
s
+=
cnvres
;
}
else
if
(
cnvres
==
MY_CS_ILSEQ
)
{
s
++
;
wc
=
'?'
;
}
else
break
;
outp:
cnvres
=
to
->
wc_mb
(
to
,
wc
,
d
,
de
);
if
(
cnvres
>
0
)
{
d
+=
cnvres
;
}
else
if
(
cnvres
==
MY_CS_ILUNI
&&
wc
!=
'?'
)
{
wc
=
'?'
;
goto
outp
;
}
else
break
;
};
str
->
length
((
uint32
)
(
d
-
d0
));
str
->
set_charset
(
to
);
return
str
;
}
}
void
Item_func_conv_charset
::
fix_length_and_dec
()
void
Item_func_conv_charset
::
fix_length_and_dec
()
...
...
sql/mysqld.cc
View file @
766673c8
...
@@ -2084,7 +2084,6 @@ static int init_common_variables(const char *conf_file_name, int argc,
...
@@ -2084,7 +2084,6 @@ static int init_common_variables(const char *conf_file_name, int argc,
#endif
#endif
if
(
!
(
default_charset_info
=
get_charset_by_name
(
sys_charset
.
value
,
MYF
(
MY_WME
))))
if
(
!
(
default_charset_info
=
get_charset_by_name
(
sys_charset
.
value
,
MYF
(
MY_WME
))))
return
1
;
return
1
;
system_charset_info
=
default_charset_info
;
charsets_list
=
list_charsets
(
MYF
(
MY_CS_COMPILED
|
MY_CS_CONFIG
));
charsets_list
=
list_charsets
(
MYF
(
MY_CS_COMPILED
|
MY_CS_CONFIG
));
if
(
use_temp_pool
&&
bitmap_init
(
&
temp_pool
,
1024
,
1
))
if
(
use_temp_pool
&&
bitmap_init
(
&
temp_pool
,
1024
,
1
))
...
...
sql/protocol.cc
View file @
766673c8
...
@@ -714,7 +714,6 @@ bool Protocol_simple::store(const char *from, uint length, CHARSET_INFO *cs)
...
@@ -714,7 +714,6 @@ bool Protocol_simple::store(const char *from, uint length, CHARSET_INFO *cs)
#endif
#endif
if
(
convert
)
if
(
convert
)
return
convert_str
(
from
,
length
);
return
convert_str
(
from
,
length
);
#if 0
if
(
cs
!=
this
->
thd
->
charset
())
if
(
cs
!=
this
->
thd
->
charset
())
{
{
String
tmp
;
String
tmp
;
...
@@ -722,7 +721,6 @@ bool Protocol_simple::store(const char *from, uint length, CHARSET_INFO *cs)
...
@@ -722,7 +721,6 @@ bool Protocol_simple::store(const char *from, uint length, CHARSET_INFO *cs)
return
net_store_data
(
tmp
.
ptr
(),
tmp
.
length
());
return
net_store_data
(
tmp
.
ptr
(),
tmp
.
length
());
}
}
else
else
#endif
return
net_store_data
(
from
,
length
);
return
net_store_data
(
from
,
length
);
}
}
...
@@ -813,11 +811,18 @@ bool Protocol_simple::store(Field *field)
...
@@ -813,11 +811,18 @@ bool Protocol_simple::store(Field *field)
field_pos
++
;
field_pos
++
;
#endif
#endif
char
buff
[
MAX_FIELD_WIDTH
];
char
buff
[
MAX_FIELD_WIDTH
];
String
tmp
(
buff
,
sizeof
(
buff
),
&
my_charset_bin
);
String
tmp
1
(
buff
,
sizeof
(
buff
),
&
my_charset_bin
);
field
->
val_str
(
&
tmp
,
&
tmp
);
field
->
val_str
(
&
tmp
1
,
&
tmp1
);
if
(
convert
)
if
(
convert
)
return
convert_str
(
tmp
.
ptr
(),
tmp
.
length
());
return
convert_str
(
tmp1
.
ptr
(),
tmp1
.
length
());
if
(
field
->
charset
()
!=
this
->
thd
->
charset
())
{
String
tmp
;
tmp
.
copy
(
tmp1
.
ptr
(),
tmp1
.
length
(),
tmp1
.
charset
(),
this
->
thd
->
charset
());
return
net_store_data
(
tmp
.
ptr
(),
tmp
.
length
());
return
net_store_data
(
tmp
.
ptr
(),
tmp
.
length
());
}
else
return
net_store_data
(
tmp1
.
ptr
(),
tmp1
.
length
());
}
}
...
...
sql/sql_string.cc
View file @
766673c8
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
#include <floatingpoint.h>
#include <floatingpoint.h>
#endif
#endif
CHARSET_INFO
*
system_charset_info
=
&
my_charset_
latin1
;
CHARSET_INFO
*
system_charset_info
=
&
my_charset_
utf8
;
extern
gptr
sql_alloc
(
unsigned
size
);
extern
gptr
sql_alloc
(
unsigned
size
);
extern
void
sql_element_free
(
void
*
ptr
);
extern
void
sql_element_free
(
void
*
ptr
);
static
uint32
static
uint32
...
...
sql/sql_yacc.yy
View file @
766673c8
...
@@ -558,7 +558,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
...
@@ -558,7 +558,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
%type <lex_str>
%type <lex_str>
IDENT TEXT_STRING REAL_NUM FLOAT_NUM NUM LONG_NUM HEX_NUM LEX_HOSTNAME
IDENT TEXT_STRING REAL_NUM FLOAT_NUM NUM LONG_NUM HEX_NUM LEX_HOSTNAME
ULONGLONG_NUM field_ident select_alias ident ident_or_text
ULONGLONG_NUM field_ident select_alias ident ident_or_text
UNDERSCORE_CHARSET
UNDERSCORE_CHARSET
IDENT_sys TEXT_STRING_sys TEXT_STRING_db
%type <lex_str_ptr>
%type <lex_str_ptr>
opt_table_alias
opt_table_alias
...
@@ -772,22 +772,22 @@ master_defs:
...
@@ -772,22 +772,22 @@ master_defs:
| master_defs ',' master_def;
| master_defs ',' master_def;
master_def:
master_def:
MASTER_HOST_SYM EQ TEXT_STRING
MASTER_HOST_SYM EQ TEXT_STRING
_sys
{
{
Lex->mi.host = $3.str;
Lex->mi.host = $3.str;
}
}
|
|
MASTER_USER_SYM EQ TEXT_STRING
MASTER_USER_SYM EQ TEXT_STRING
_sys
{
{
Lex->mi.user = $3.str;
Lex->mi.user = $3.str;
}
}
|
|
MASTER_PASSWORD_SYM EQ TEXT_STRING
MASTER_PASSWORD_SYM EQ TEXT_STRING
_sys
{
{
Lex->mi.password = $3.str;
Lex->mi.password = $3.str;
}
}
|
|
MASTER_LOG_FILE_SYM EQ TEXT_STRING
MASTER_LOG_FILE_SYM EQ TEXT_STRING
_sys
{
{
Lex->mi.log_file_name = $3.str;
Lex->mi.log_file_name = $3.str;
}
}
...
@@ -807,7 +807,7 @@ master_def:
...
@@ -807,7 +807,7 @@ master_def:
Lex->mi.connect_retry = $3;
Lex->mi.connect_retry = $3;
}
}
|
|
RELAY_LOG_FILE_SYM EQ TEXT_STRING
RELAY_LOG_FILE_SYM EQ TEXT_STRING
_sys
{
{
Lex->mi.relay_log_name = $3.str;
Lex->mi.relay_log_name = $3.str;
}
}
...
@@ -877,14 +877,14 @@ create:
...
@@ -877,14 +877,14 @@ create:
lex->name=$4.str;
lex->name=$4.str;
lex->create_info.options=$3;
lex->create_info.options=$3;
}
}
| CREATE udf_func_type UDF_SYM IDENT
| CREATE udf_func_type UDF_SYM IDENT
_sys
{
{
LEX *lex=Lex;
LEX *lex=Lex;
lex->sql_command = SQLCOM_CREATE_FUNCTION;
lex->sql_command = SQLCOM_CREATE_FUNCTION;
lex->udf.name = $4;
lex->udf.name = $4;
lex->udf.type= $2;
lex->udf.type= $2;
}
}
UDF_RETURNS_SYM udf_type UDF_SONAME_SYM TEXT_STRING
UDF_RETURNS_SYM udf_type UDF_SONAME_SYM TEXT_STRING
_sys
{
{
LEX *lex=Lex;
LEX *lex=Lex;
lex->udf.returns=(Item_result) $7;
lex->udf.returns=(Item_result) $7;
...
@@ -966,8 +966,8 @@ create_table_option:
...
@@ -966,8 +966,8 @@ create_table_option:
| MAX_ROWS opt_equal ulonglong_num { Lex->create_info.max_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MAX_ROWS;}
| MAX_ROWS opt_equal ulonglong_num { Lex->create_info.max_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MAX_ROWS;}
| MIN_ROWS opt_equal ulonglong_num { Lex->create_info.min_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MIN_ROWS;}
| MIN_ROWS opt_equal ulonglong_num { Lex->create_info.min_rows= $3; Lex->create_info.used_fields|= HA_CREATE_USED_MIN_ROWS;}
| AVG_ROW_LENGTH opt_equal ULONG_NUM { Lex->create_info.avg_row_length=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH;}
| AVG_ROW_LENGTH opt_equal ULONG_NUM { Lex->create_info.avg_row_length=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH;}
| PASSWORD opt_equal TEXT_STRING { Lex->create_info.password=$3.str; }
| PASSWORD opt_equal TEXT_STRING
_sys
{ Lex->create_info.password=$3.str; }
| COMMENT_SYM opt_equal TEXT_STRING { Lex->create_info.comment=$3.str; }
| COMMENT_SYM opt_equal TEXT_STRING
_sys
{ Lex->create_info.comment=$3.str; }
| AUTO_INC opt_equal ulonglong_num { Lex->create_info.auto_increment_value=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AUTO;}
| AUTO_INC opt_equal ulonglong_num { Lex->create_info.auto_increment_value=$3; Lex->create_info.used_fields|= HA_CREATE_USED_AUTO;}
| PACK_KEYS_SYM opt_equal ULONG_NUM { Lex->create_info.table_options|= $3 ? HA_OPTION_PACK_KEYS : HA_OPTION_NO_PACK_KEYS; Lex->create_info.used_fields|= HA_CREATE_USED_PACK_KEYS;}
| PACK_KEYS_SYM opt_equal ULONG_NUM { Lex->create_info.table_options|= $3 ? HA_OPTION_PACK_KEYS : HA_OPTION_NO_PACK_KEYS; Lex->create_info.used_fields|= HA_CREATE_USED_PACK_KEYS;}
| PACK_KEYS_SYM opt_equal DEFAULT { Lex->create_info.table_options&= ~(HA_OPTION_PACK_KEYS | HA_OPTION_NO_PACK_KEYS); Lex->create_info.used_fields|= HA_CREATE_USED_PACK_KEYS;}
| PACK_KEYS_SYM opt_equal DEFAULT { Lex->create_info.table_options&= ~(HA_OPTION_PACK_KEYS | HA_OPTION_NO_PACK_KEYS); Lex->create_info.used_fields|= HA_CREATE_USED_PACK_KEYS;}
...
@@ -1001,8 +1001,9 @@ create_table_option:
...
@@ -1001,8 +1001,9 @@ create_table_option:
Lex->create_info.used_fields|= HA_CREATE_USED_CHARSET;
Lex->create_info.used_fields|= HA_CREATE_USED_CHARSET;
}
}
| INSERT_METHOD opt_equal merge_insert_types { Lex->create_info.merge_insert_method= $3; Lex->create_info.used_fields|= HA_CREATE_USED_INSERT_METHOD;}
| INSERT_METHOD opt_equal merge_insert_types { Lex->create_info.merge_insert_method= $3; Lex->create_info.used_fields|= HA_CREATE_USED_INSERT_METHOD;}
| DATA_SYM DIRECTORY_SYM opt_equal TEXT_STRING { Lex->create_info.data_file_name= $4.str; }
| DATA_SYM DIRECTORY_SYM opt_equal TEXT_STRING_sys
| INDEX DIRECTORY_SYM opt_equal TEXT_STRING { Lex->create_info.index_file_name= $4.str; };
{ Lex->create_info.data_file_name= $4.str; }
| INDEX DIRECTORY_SYM opt_equal TEXT_STRING_sys { Lex->create_info.index_file_name= $4.str; };
table_types:
table_types:
ISAM_SYM { $$= DB_TYPE_ISAM; }
ISAM_SYM { $$= DB_TYPE_ISAM; }
...
@@ -1637,7 +1638,7 @@ restore:
...
@@ -1637,7 +1638,7 @@ restore:
{
{
Lex->sql_command = SQLCOM_RESTORE_TABLE;
Lex->sql_command = SQLCOM_RESTORE_TABLE;
}
}
table_list FROM TEXT_STRING
table_list FROM TEXT_STRING
_sys
{
{
Lex->backup_dir = $6.str;
Lex->backup_dir = $6.str;
};
};
...
@@ -1647,7 +1648,7 @@ backup:
...
@@ -1647,7 +1648,7 @@ backup:
{
{
Lex->sql_command = SQLCOM_BACKUP_TABLE;
Lex->sql_command = SQLCOM_BACKUP_TABLE;
}
}
table_list TO_SYM TEXT_STRING
table_list TO_SYM TEXT_STRING
_sys
{
{
Lex->backup_dir = $6.str;
Lex->backup_dir = $6.str;
};
};
...
@@ -1897,9 +1898,9 @@ select_item:
...
@@ -1897,9 +1898,9 @@ select_item:
if (add_item_to_list(YYTHD, $2))
if (add_item_to_list(YYTHD, $2))
YYABORT;
YYABORT;
if ($4.str)
if ($4.str)
$2->set_name($4.str);
$2->set_name($4.str
,$4.length,system_charset_info
);
else if (!$2->name)
else if (!$2->name)
$2->set_name($1,(uint) ($3 - $1));
$2->set_name($1,(uint) ($3 - $1)
, YYTHD->charset()
);
};
};
remember_name:
remember_name:
...
@@ -1913,11 +1914,12 @@ select_item2:
...
@@ -1913,11 +1914,12 @@ select_item2:
| expr { $$=$1; };
| expr { $$=$1; };
select_alias:
select_alias:
{ $$.str=0;}
/* empty */
{ $$.str=0;}
| AS ident { $$=$2; }
| AS ident { $$=$2; }
| AS TEXT_STRING
{ $$=$2; }
| AS TEXT_STRING
_sys
{ $$=$2; }
| ident { $$=$1; }
| ident { $$=$1; }
| TEXT_STRING { $$=$1; };
| TEXT_STRING_sys { $$=$1; }
;
optional_braces:
optional_braces:
/* empty */ {}
/* empty */ {}
...
@@ -2219,9 +2221,9 @@ simple_expr:
...
@@ -2219,9 +2221,9 @@ simple_expr:
Lex->uncacheable();;
Lex->uncacheable();;
}
}
| ENCRYPT '(' expr ',' expr ')' { $$= new Item_func_encrypt($3,$5); }
| ENCRYPT '(' expr ',' expr ')' { $$= new Item_func_encrypt($3,$5); }
| DECODE_SYM '(' expr ',' TEXT_STRING ')'
| DECODE_SYM '(' expr ',' TEXT_STRING
_db
')'
{ $$= new Item_func_decode($3,$5.str); }
{ $$= new Item_func_decode($3,$5.str); }
| ENCODE_SYM '(' expr ',' TEXT_STRING ')'
| ENCODE_SYM '(' expr ',' TEXT_STRING
_db
')'
{ $$= new Item_func_encode($3,$5.str); }
{ $$= new Item_func_encode($3,$5.str); }
| DES_DECRYPT_SYM '(' expr ')'
| DES_DECRYPT_SYM '(' expr ')'
{ $$= new Item_func_des_decrypt($3); }
{ $$= new Item_func_des_decrypt($3); }
...
@@ -2818,7 +2820,7 @@ having_clause:
...
@@ -2818,7 +2820,7 @@ having_clause:
;
;
opt_escape:
opt_escape:
ESCAPE_SYM TEXT_STRING { $$= $2.str; }
ESCAPE_SYM TEXT_STRING
_db
{ $$= $2.str; }
| /* empty */ { $$= (char*) "\\"; };
| /* empty */ { $$= (char*) "\\"; };
...
@@ -3015,7 +3017,7 @@ procedure_item:
...
@@ -3015,7 +3017,7 @@ procedure_item:
if (add_proc_to_list(lex->thd, $2))
if (add_proc_to_list(lex->thd, $2))
YYABORT;
YYABORT;
if (!$2->name)
if (!$2->name)
$2->set_name($1,(uint) ((char*) lex->tok_end - $1));
$2->set_name($1,(uint) ((char*) lex->tok_end - $1)
, YYTHD->charset()
);
}
}
;
;
...
@@ -3044,7 +3046,7 @@ select_var_ident: '@' ident_or_text
...
@@ -3044,7 +3046,7 @@ select_var_ident: '@' ident_or_text
;
;
into:
into:
INTO OUTFILE TEXT_STRING
INTO OUTFILE TEXT_STRING
_sys
{
{
LEX *lex=Lex;
LEX *lex=Lex;
if (!lex->describe)
if (!lex->describe)
...
@@ -3056,7 +3058,7 @@ into:
...
@@ -3056,7 +3058,7 @@ into:
}
}
}
}
opt_field_term opt_line_term
opt_field_term opt_line_term
| INTO DUMPFILE TEXT_STRING
| INTO DUMPFILE TEXT_STRING
_sys
{
{
LEX *lex=Lex;
LEX *lex=Lex;
if (!lex->describe)
if (!lex->describe)
...
@@ -3118,7 +3120,7 @@ drop:
...
@@ -3118,7 +3120,7 @@ drop:
lex->drop_if_exists=$3;
lex->drop_if_exists=$3;
lex->name=$4.str;
lex->name=$4.str;
}
}
| DROP UDF_SYM IDENT
| DROP UDF_SYM IDENT
_sys
{
{
LEX *lex=Lex;
LEX *lex=Lex;
lex->sql_command = SQLCOM_DROP_FUNCTION;
lex->sql_command = SQLCOM_DROP_FUNCTION;
...
@@ -3478,7 +3480,7 @@ show_param:
...
@@ -3478,7 +3480,7 @@ show_param:
YYABORT;
YYABORT;
}
}
| NEW_SYM MASTER_SYM FOR_SYM SLAVE WITH MASTER_LOG_FILE_SYM EQ
| NEW_SYM MASTER_SYM FOR_SYM SLAVE WITH MASTER_LOG_FILE_SYM EQ
TEXT_STRING AND MASTER_LOG_POS_SYM EQ ulonglong_num
TEXT_STRING
_sys
AND MASTER_LOG_POS_SYM EQ ulonglong_num
AND MASTER_SERVER_ID_SYM EQ
AND MASTER_SERVER_ID_SYM EQ
ULONG_NUM
ULONG_NUM
{
{
...
@@ -3593,7 +3595,7 @@ from_or_in:
...
@@ -3593,7 +3595,7 @@ from_or_in:
binlog_in:
binlog_in:
/* empty */ { Lex->mi.log_file_name = 0; }
/* empty */ { Lex->mi.log_file_name = 0; }
| IN_SYM TEXT_STRING { Lex->mi.log_file_name = $2.str; };
| IN_SYM TEXT_STRING
_sys
{ Lex->mi.log_file_name = $2.str; };
binlog_from:
binlog_from:
/* empty */ { Lex->mi.pos = 4; /* skip magic number */ }
/* empty */ { Lex->mi.pos = 4; /* skip magic number */ }
...
@@ -3696,7 +3698,7 @@ purge_options:
...
@@ -3696,7 +3698,7 @@ purge_options:
;
;
purge_option:
purge_option:
TO_SYM TEXT_STRING
TO_SYM TEXT_STRING
_sys
{
{
Lex->sql_command = SQLCOM_PURGE;
Lex->sql_command = SQLCOM_PURGE;
Lex->to_log = $2.str;
Lex->to_log = $2.str;
...
@@ -3740,7 +3742,7 @@ use: USE_SYM ident
...
@@ -3740,7 +3742,7 @@ use: USE_SYM ident
/* import, export of files */
/* import, export of files */
load: LOAD DATA_SYM load_data_lock opt_local INFILE TEXT_STRING
load: LOAD DATA_SYM load_data_lock opt_local INFILE TEXT_STRING
_sys
{
{
LEX *lex=Lex;
LEX *lex=Lex;
lex->sql_command= SQLCOM_LOAD;
lex->sql_command= SQLCOM_LOAD;
...
@@ -3824,17 +3826,21 @@ opt_ignore_lines:
...
@@ -3824,17 +3826,21 @@ opt_ignore_lines:
/* Common definitions */
/* Common definitions */
text_literal:
text_literal:
TEXT_STRING
TEXT_STRING_db
{ $$ = new Item_string($1.str,$1.length,
{
YYTHD->variables.thd_charset); }
THD *thd= YYTHD;
CHARSET_INFO *cs= my_charset_same(thd->charset(),thd->db_charset) ?
thd->charset() : thd->db_charset;
$$ = new Item_string($1.str,$1.length,cs);
}
| UNDERSCORE_CHARSET TEXT_STRING
| UNDERSCORE_CHARSET TEXT_STRING
{ $$ = new Item_string($2.str,$2.length,Lex->charset,Item::COER_IMPLICIT); }
{ $$ = new Item_string($2.str,$2.length,Lex->charset,Item::COER_IMPLICIT); }
| text_literal TEXT_STRING
| text_literal TEXT_STRING
_db
{ ((Item_string*) $1)->append($2.str,$2.length); };
{ ((Item_string*) $1)->append($2.str,$2.length); };
text_string:
text_string:
TEXT_STRING
TEXT_STRING
_db
{ $$= new String($1.str,$1.length,YYTHD->
variables.thd
_charset); }
{ $$= new String($1.str,$1.length,YYTHD->
db
_charset); }
| HEX_NUM
| HEX_NUM
{
{
Item *tmp = new Item_varbinary($1.str,$1.length);
Item *tmp = new Item_varbinary($1.str,$1.length);
...
@@ -3957,8 +3963,63 @@ table_ident:
...
@@ -3957,8 +3963,63 @@ table_ident:
| '.' ident { $$=new Table_ident($2);}
| '.' ident { $$=new Table_ident($2);}
/* For Delphi */;
/* For Delphi */;
IDENT_sys:
IDENT
{
THD *thd= YYTHD;
if (my_charset_same(thd->charset(),system_charset_info))
{
$$=$1;
}
else
{
String ident;
ident.copy($1.str,$1.length,thd->charset(),system_charset_info);
$$.str= thd->strmake(ident.ptr(),ident.length());
$$.length= ident.length();
}
}
;
TEXT_STRING_sys:
TEXT_STRING
{
THD *thd= YYTHD;
if (my_charset_same(thd->charset(),system_charset_info))
{
$$=$1;
}
else
{
String ident;
ident.copy($1.str,$1.length,thd->charset(),system_charset_info);
$$.str= thd->strmake(ident.ptr(),ident.length());
$$.length= ident.length();
}
}
;
TEXT_STRING_db:
TEXT_STRING
{
THD *thd= YYTHD;
if (my_charset_same(thd->charset(),thd->db_charset))
{
$$=$1;
}
else
{
String ident;
ident.copy($1.str,$1.length,thd->charset(),thd->db_charset);
$$.str= thd->strmake(ident.ptr(),ident.length());
$$.length= ident.length();
}
}
;
ident:
ident:
IDENT { $$=$1; }
IDENT
_sys
{ $$=$1; }
| keyword
| keyword
{
{
LEX *lex= Lex;
LEX *lex= Lex;
...
@@ -3971,7 +4032,7 @@ ident:
...
@@ -3971,7 +4032,7 @@ ident:
ident_or_text:
ident_or_text:
ident { $$=$1;}
ident { $$=$1;}
| TEXT_STRING { $$=$1;}
| TEXT_STRING
_sys
{ $$=$1;}
| LEX_HOSTNAME { $$=$1;};
| LEX_HOSTNAME { $$=$1;};
user:
user:
...
...
strings/ctype-utf8.c
View file @
766673c8
...
@@ -27,6 +27,10 @@
...
@@ -27,6 +27,10 @@
#define EILSEQ ENOENT
#define EILSEQ ENOENT
#endif
#endif
#ifndef HAVE_CHARSET_utf8
#define HAVE_CHARSET_utf8
#endif
#ifdef HAVE_CHARSET_utf8
#ifdef HAVE_CHARSET_utf8
#define HAVE_UNIDATA
#define HAVE_UNIDATA
#endif
#endif
...
...
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