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
4fc1f429
Commit
4fc1f429
authored
Jul 26, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0 mysys/charset.c: Auto merged
parents
3521daed
08216d3a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
16 deletions
+18
-16
mysys/charset.c
mysys/charset.c
+18
-16
No files found.
mysys/charset.c
View file @
4fc1f429
...
...
@@ -383,26 +383,28 @@ static my_bool init_available_charsets(myf myflags)
while we may changing the cs_info_table
*/
pthread_mutex_lock
(
&
THR_LOCK_charset
);
bzero
(
&
all_charsets
,
sizeof
(
all_charsets
));
init_compiled_charsets
(
myflags
);
/* Copy compiled charsets */
for
(
cs
=
all_charsets
;
cs
<
all_charsets
+
array_elements
(
all_charsets
)
-
1
;
cs
++
)
if
(
!
charset_initialized
)
{
if
(
*
cs
)
bzero
(
&
all_charsets
,
sizeof
(
all_charsets
));
init_compiled_charsets
(
myflags
);
/* Copy compiled charsets */
for
(
cs
=
all_charsets
;
cs
<
all_charsets
+
array_elements
(
all_charsets
)
-
1
;
cs
++
)
{
if
(
cs
[
0
]
->
ctype
)
if
(
init_state_maps
(
*
cs
))
*
cs
=
NULL
;
if
(
*
cs
)
{
if
(
cs
[
0
]
->
ctype
)
if
(
init_state_maps
(
*
cs
))
*
cs
=
NULL
;
}
}
strmov
(
get_charsets_dir
(
fname
),
MY_CHARSET_INDEX
);
error
=
my_read_charset_file
(
fname
,
myflags
);
charset_initialized
=
1
;
}
strmov
(
get_charsets_dir
(
fname
),
MY_CHARSET_INDEX
);
error
=
my_read_charset_file
(
fname
,
myflags
);
charset_initialized
=
1
;
pthread_mutex_unlock
(
&
THR_LOCK_charset
);
}
return
error
;
...
...
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