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
1de9a055
Commit
1de9a055
authored
Jul 19, 2005
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor fix (backport from 5.0) - changed function prototype/definition
parent
7adfe96d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
include/mysql.h
include/mysql.h
+1
-1
libmysql/libmysql.c
libmysql/libmysql.c
+3
-2
No files found.
include/mysql.h
View file @
1de9a055
...
@@ -381,7 +381,7 @@ unsigned int STDCALL mysql_warning_count(MYSQL *mysql);
...
@@ -381,7 +381,7 @@ unsigned int STDCALL mysql_warning_count(MYSQL *mysql);
const
char
*
STDCALL
mysql_info
(
MYSQL
*
mysql
);
const
char
*
STDCALL
mysql_info
(
MYSQL
*
mysql
);
unsigned
long
STDCALL
mysql_thread_id
(
MYSQL
*
mysql
);
unsigned
long
STDCALL
mysql_thread_id
(
MYSQL
*
mysql
);
const
char
*
STDCALL
mysql_character_set_name
(
MYSQL
*
mysql
);
const
char
*
STDCALL
mysql_character_set_name
(
MYSQL
*
mysql
);
int
STDCALL
mysql_set_character_set
(
MYSQL
*
mysql
,
char
*
csname
);
int
STDCALL
mysql_set_character_set
(
MYSQL
*
mysql
,
const
char
*
csname
);
MYSQL
*
STDCALL
mysql_init
(
MYSQL
*
mysql
);
MYSQL
*
STDCALL
mysql_init
(
MYSQL
*
mysql
);
my_bool
STDCALL
mysql_ssl_set
(
MYSQL
*
mysql
,
const
char
*
key
,
my_bool
STDCALL
mysql_ssl_set
(
MYSQL
*
mysql
,
const
char
*
key
,
...
...
libmysql/libmysql.c
View file @
1de9a055
...
@@ -1510,7 +1510,7 @@ const char * STDCALL mysql_character_set_name(MYSQL *mysql)
...
@@ -1510,7 +1510,7 @@ const char * STDCALL mysql_character_set_name(MYSQL *mysql)
}
}
int
STDCALL
mysql_set_character_set
(
MYSQL
*
mysql
,
char
*
cs_name
)
int
STDCALL
mysql_set_character_set
(
MYSQL
*
mysql
,
c
onst
c
har
*
cs_name
)
{
{
struct
charset_info_st
*
cs
;
struct
charset_info_st
*
cs
;
const
char
*
save_csdir
=
charsets_dir
;
const
char
*
save_csdir
=
charsets_dir
;
...
@@ -1518,7 +1518,8 @@ int STDCALL mysql_set_character_set(MYSQL *mysql, char *cs_name)
...
@@ -1518,7 +1518,8 @@ int STDCALL mysql_set_character_set(MYSQL *mysql, char *cs_name)
if
(
mysql
->
options
.
charset_dir
)
if
(
mysql
->
options
.
charset_dir
)
charsets_dir
=
mysql
->
options
.
charset_dir
;
charsets_dir
=
mysql
->
options
.
charset_dir
;
if
((
cs
=
get_charset_by_csname
(
cs_name
,
MY_CS_PRIMARY
,
MYF
(
0
))))
if
(
strlen
(
cs_name
)
<
MY_CS_NAME_SIZE
&&
(
cs
=
get_charset_by_csname
(
cs_name
,
MY_CS_PRIMARY
,
MYF
(
0
))))
{
{
char
buff
[
MY_CS_NAME_SIZE
+
10
];
char
buff
[
MY_CS_NAME_SIZE
+
10
];
charsets_dir
=
save_csdir
;
charsets_dir
=
save_csdir
;
...
...
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