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
624f8c13
Commit
624f8c13
authored
Oct 09, 2000
by
tim@threads.polyesthetic.msg
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql
into threads.polyesthetic.msg:/usr/local/src/my/work
parents
2b5a7608
395a1809
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
include/my_sys.h
include/my_sys.h
+1
-0
libmysql/libmysql.c
libmysql/libmysql.c
+12
-4
mysys/charset.c
mysys/charset.c
+1
-1
No files found.
include/my_sys.h
View file @
624f8c13
...
@@ -178,6 +178,7 @@ extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
...
@@ -178,6 +178,7 @@ extern CHARSET_INFO *get_charset_by_name(const char *cs_name, myf flags);
extern
my_bool
set_default_charset_by_name
(
const
char
*
cs_name
,
myf
flags
);
extern
my_bool
set_default_charset_by_name
(
const
char
*
cs_name
,
myf
flags
);
extern
void
free_charsets
(
void
);
extern
void
free_charsets
(
void
);
extern
char
*
list_charsets
(
myf
want_flags
);
/* my_free() this string... */
extern
char
*
list_charsets
(
myf
want_flags
);
/* my_free() this string... */
extern
char
*
get_charsets_dir
(
char
*
buf
);
/* statistics */
/* statistics */
...
...
libmysql/libmysql.c
View file @
624f8c13
...
@@ -1394,10 +1394,18 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
...
@@ -1394,10 +1394,18 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
if
(
!
mysql
->
charset
)
if
(
!
mysql
->
charset
)
{
{
net
->
last_errno
=
CR_CANT_READ_CHARSET
;
net
->
last_errno
=
CR_CANT_READ_CHARSET
;
if
(
mysql
->
options
.
charset_dir
)
sprintf
(
net
->
last_error
,
ER
(
net
->
last_errno
),
charset_name
?
charset_name
:
"unknown"
,
mysql
->
options
.
charset_dir
);
else
{
char
cs_dir_name
[
FN_REFLEN
];
get_charsets_dir
(
cs_dir_name
);
sprintf
(
net
->
last_error
,
ER
(
net
->
last_errno
),
sprintf
(
net
->
last_error
,
ER
(
net
->
last_errno
),
charset_name
?
charset_name
:
"unknown"
,
charset_name
?
charset_name
:
"unknown"
,
mysql
->
options
.
charset_dir
?
mysql
->
options
.
charset_dir
:
cs_dir_name
);
"default"
);
}
goto
error
;
goto
error
;
}
}
...
...
mysys/charset.c
View file @
624f8c13
...
@@ -94,7 +94,7 @@ static my_bool get_word(struct simpleconfig_buf_st *fb, char *buf)
...
@@ -94,7 +94,7 @@ static my_bool get_word(struct simpleconfig_buf_st *fb, char *buf)
}
}
static
char
*
get_charsets_dir
(
char
*
buf
)
char
*
get_charsets_dir
(
char
*
buf
)
{
{
const
char
*
sharedir
=
SHAREDIR
;
const
char
*
sharedir
=
SHAREDIR
;
DBUG_ENTER
(
"get_charsets_dir"
);
DBUG_ENTER
(
"get_charsets_dir"
);
...
...
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