summaryrefslogtreecommitdiff
path: root/include/my_sys.h
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2019-06-17 09:56:00 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2019-06-17 18:04:47 +0100
commit5804bb4ef0acd7ac42e628c2d8c404957dc86cf9 (patch)
treed8180213953c76959d0a19aeb9c3e688722b23e2 /include/my_sys.h
parent81f60e8adeb241ed845427e0792349f3a05af99b (diff)
downloadmariadb-git-5804bb4ef0acd7ac42e628c2d8c404957dc86cf9.tar.gz
MDEV-19750 mysql command wrong encoding
Restore the detection of default charset in command line utilities. It worked up to 10.1, but was broken by Connector/C. Moved code for detection of default charset from sql-common/client.c to mysys, and make command line utilities to use this code if charset was not specified on the command line.
Diffstat (limited to 'include/my_sys.h')
-rw-r--r--include/my_sys.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index c1d81108a84..fe66aeef48c 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -1043,6 +1043,7 @@ extern char *get_tty_password(const char *opt_message);
/* File system character set */
extern CHARSET_INFO *fs_character_set(void);
#endif
+extern const char *my_default_csname(void);
extern size_t escape_quotes_for_mysql(CHARSET_INFO *charset_info,
char *to, size_t to_length,
const char *from, size_t length);