diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 08:56:10 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 08:56:10 +0300 |
| commit | 192aa295b4bc877d0fed24154c57304c3f789179 (patch) | |
| tree | 893239effa9f3c9a7d00b324de9b4e41c63bdb4d /include/my_sys.h | |
| parent | 03f3ba2dcb07a672f9c1d87489b9ec88af62a96f (diff) | |
| parent | 8acbf9c1f961aa1008ef509e059e1a09943f5ed3 (diff) | |
| download | mariadb-git-192aa295b4bc877d0fed24154c57304c3f789179.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 3fc36bdd75b..62c76adedfc 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -1049,6 +1049,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); |