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
2e60b30c
Commit
2e60b30c
authored
May 13, 2013
by
Murthy Narkedimilli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merging the changes for build failures in windows.
parent
500f76f4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
12 deletions
+2
-12
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.cc
+2
-12
No files found.
storage/innodb_plugin/handler/ha_innodb.cc
View file @
2e60b30c
...
...
@@ -11624,6 +11624,7 @@ test_innobase_convert_name()
}
}
}
#endif
/* UNIV_COMPILE_TEST_FUNCS */
/**********************************************************************
Converts an identifier from my_charset_filename to UTF-8 charset. */
...
...
@@ -11636,19 +11637,8 @@ innobase_convert_to_filename_charset(
ulint
len
)
/* in: length of 'to', in bytes */
{
uint
errors
;
uint
rlen
;
CHARSET_INFO
*
cs_to
=
&
my_charset_filename
;
CHARSET_INFO
*
cs_from
=
system_charset_info
;
rlen
=
strconvert
(
cs_from
,
from
,
cs_to
,
to
,
len
,
&
errors
);
if
(
errors
)
{
fprintf
(
stderr
,
"InnoDB: There was a problem in converting"
"'%s' in charset %s to charset %s"
,
from
,
cs_from
->
name
,
cs_to
->
name
);
}
return
(
rlen
);
return
(
strconvert
(
cs_from
,
from
,
cs_to
,
to
,
len
,
&
errors
));
}
#endif
/* UNIV_COMPILE_TEST_FUNCS */
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