diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 10:49:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 10:49:00 +0300 |
| commit | 02979daab48d871e8c43a227b8f4462128439f17 (patch) | |
| tree | 21dba14f0073df2328677ed0a90a3596f043bdeb /include | |
| parent | efbfcc8b73d9fd8bafd86ab387e0c1edd39e208b (diff) | |
| parent | 192aa295b4bc877d0fed24154c57304c3f789179 (diff) | |
| download | mariadb-git-02979daab48d871e8c43a227b8f4462128439f17.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'include')
| -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 f224431ce3f..eb6129ea238 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); |