1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/usr/home/bar/mysql-4.1.b18004

Browse Source 
into  mysql.com:/usr/home/bar/mysql-5.0
This commit is contained in:
bar@mysql.com 2006-03-22 13:11:31 +04:00
commit cab060d2e2
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/ctype_ucs2_def.result Normal file
View File

@ -0,0 +1,6 @@
show variables like "%character_set_ser%";
Variable_name Value
character_set_server ucs2
DROP TABLE IF EXISTS t1;
create table t1 (a int);
drop table t1;

1
mysql-test/t/ctype_ucs2_def-master.opt Normal file
View File

@ -0,0 +1 @@
--default-character-set=ucs2 --default-collation=ucs2_unicode_ci

9
mysql-test/t/ctype_ucs2_def.test Normal file
View File

@ -0,0 +1,9 @@
#
# Bug#18004 Connecting crashes server when default charset is UCS2
#
show variables like "%character_set_ser%";
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
create table t1 (a int);
drop table t1;

6
sql/table.cc
View File

@ -1597,7 +1597,7 @@ bool check_db_name(char *name)
while (*name)
{
#if defined(USE_MB) && defined(USE_MB_IDENT)
last_char_is_space= my_isspace(default_charset_info, *name);
last_char_is_space= my_isspace(system_charset_info, *name);
if (use_mb(system_charset_info))
{
int len=my_ismbchar(system_charset_info, name,
@ -1643,7 +1643,7 @@ bool check_table_name(const char *name, uint length)
while (name != end)
{
#if defined(USE_MB) && defined(USE_MB_IDENT)
last_char_is_space= my_isspace(default_charset_info, *name);
last_char_is_space= my_isspace(system_charset_info, *name);
if (use_mb(system_charset_info))
{
int len=my_ismbchar(system_charset_info, name, end);
@ -1674,7 +1674,7 @@ bool check_column_name(const char *name)
while (*name)
{
#if defined(USE_MB) && defined(USE_MB_IDENT)
last_char_is_space= my_isspace(default_charset_info, *name);
last_char_is_space= my_isspace(system_charset_info, *name);
if (use_mb(system_charset_info))
{
int len=my_ismbchar(system_charset_info, name,