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
49591aa3
Commit
49591aa3
authored
Aug 11, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b15276
parents
256ac388
edc8900b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
3 deletions
+13
-3
mysql-test/r/ctype_ucs2_def.result
mysql-test/r/ctype_ucs2_def.result
+3
-0
mysql-test/t/ctype_ucs2_def-master.opt
mysql-test/t/ctype_ucs2_def-master.opt
+1
-1
mysql-test/t/ctype_ucs2_def.test
mysql-test/t/ctype_ucs2_def.test
+5
-0
sql/mysqld.cc
sql/mysqld.cc
+4
-2
No files found.
mysql-test/r/ctype_ucs2_def.result
View file @
49591aa3
show variables like 'collation_server';
Variable_name Value
collation_server ucs2_unicode_ci
show variables like "%character_set_ser%";
Variable_name Value
character_set_server ucs2
...
...
mysql-test/t/ctype_ucs2_def-master.opt
View file @
49591aa3
--default-c
haracter-set=ucs2 --default-collation=ucs2_unicode_ci
--default-c
ollation=ucs2_unicode_ci --default-character-set=ucs2
mysql-test/t/ctype_ucs2_def.test
View file @
49591aa3
#
# MySQL Bug#15276: MySQL ignores collation-server
#
show
variables
like
'collation_server'
;
#
# Bug#18004 Connecting crashes server when default charset is UCS2
#
...
...
sql/mysqld.cc
View file @
49591aa3
...
...
@@ -378,6 +378,7 @@ key_map key_map_full(0); // Will be initialized later
const
char
*
opt_date_time_formats
[
3
];
char
compiled_default_collation_name
[]
=
MYSQL_DEFAULT_COLLATION_NAME
;
char
*
language_ptr
,
*
default_collation_name
,
*
default_character_set_name
;
char
mysql_data_home_buff
[
2
],
*
mysql_data_home
=
mysql_real_data_home
;
struct
passwd
*
user_info
;
...
...
@@ -5936,7 +5937,7 @@ static void mysql_init_variables(void)
/* Variables in libraries */
charsets_dir
=
0
;
default_character_set_name
=
(
char
*
)
MYSQL_DEFAULT_CHARSET_NAME
;
default_collation_name
=
(
char
*
)
MYSQL_DEFAULT_COLLATION_NAME
;
default_collation_name
=
compiled_default_collation_name
;
sys_charset_system
.
value
=
(
char
*
)
system_charset_info
->
csname
;
...
...
@@ -6091,7 +6092,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
strmake
(
mysql_home
,
argument
,
sizeof
(
mysql_home
)
-
1
);
break
;
case
'C'
:
default_collation_name
=
0
;
if
(
default_collation_name
==
compiled_default_collation_name
)
default_collation_name
=
0
;
break
;
case
'l'
:
opt_log
=
1
;
...
...
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