diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2022-01-18 21:37:52 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2022-01-18 21:37:52 +0100 |
| commit | e222e44d1bfc995870430bb90d8ac97e91f66cb4 (patch) | |
| tree | e720df7a0fba13fa0a66bb53d910d007567083ad /include | |
| parent | d9f7a6b3316cdaa16acff2c8621e775f49153b20 (diff) | |
| parent | 2e48fbe3f5e84ebb8a2de4f4fc0448d648d25c0c (diff) | |
| download | mariadb-git-e222e44d1bfc995870430bb90d8ac97e91f66cb4.tar.gz | |
Merge branch 'preview-10.8-MDEV-26713-Windows-i18-support' into 10.8bb-10.8-wlad
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 8 | ||||
| -rw-r--r-- | include/my_sys.h | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/include/my_global.h b/include/my_global.h index 224909116dd..ed213e69f85 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -29,6 +29,14 @@ #pragma GCC poison __WIN__ #endif +#if defined(_MSC_VER) +/* + Following functions have bugs, when used with UTF-8 active codepage. + #include <winservice.h> will use the non-buggy wrappers +*/ +#pragma deprecated("CreateServiceA", "OpenServiceA", "ChangeServiceConfigA") +#endif + /* InnoDB depends on some MySQL internals which other plugins should not need. This is because of InnoDB's foreign key support, "safe" binlog diff --git a/include/my_sys.h b/include/my_sys.h index 3d2a7280e53..58d036c6fc3 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -1087,6 +1087,9 @@ extern char *get_tty_password(const char *opt_message); #define BACKSLASH_MBTAIL /* File system character set */ extern CHARSET_INFO *fs_character_set(void); +extern int my_set_console_cp(const char *name); +#else +#define my_set_console_cp(A) do {} while (0) #endif extern const char *my_default_csname(void); extern size_t escape_quotes_for_mysql(CHARSET_INFO *charset_info, @@ -1098,13 +1101,6 @@ extern void thd_increment_bytes_sent(void *thd, size_t length); extern void thd_increment_bytes_received(void *thd, size_t length); extern void thd_increment_net_big_packet_count(void *thd, size_t length); -#ifdef _WIN32 - -/* implemented in my_conio.c */ -char* my_cgets(char *string, size_t clen, size_t* plen); - -#endif - #include <mysql/psi/psi.h> #ifdef HAVE_PSI_INTERFACE |