From ba9d231b5ab75bc3614e53bdd95026e5fe9dd565 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Mon, 22 Nov 2021 12:29:15 +0100 Subject: MDEV-26713 Set activeCodePage=UTF8 for windows programs - Use corresponding entry in the manifest, as described in https://docs.microsoft.com/en-us/windows/apps/design/globalizing/use-utf8-code-page - If if ANSI codepage is UTF8 (i.e for Windows 1903 and later) Use UTF8 as default client charset Set console codepage(s) to UTF8, in case process is using console - Allow some previously disabled MTR tests, that used Unicode for in "exec", for the recent Windows versions --- mysql-test/suite.pm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'mysql-test/suite.pm') diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 4cc6b410fa1..ad67117a229 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -87,6 +87,28 @@ sub skip_combinations { $skip{'main/ssl_verify_ip.test'} = 'x509v3 support required' unless $openssl_ver ge "1.0.2"; + sub utf8_command_line_ok() { + if (IS_WINDOWS) { + # Can use UTF8 on command line since Windows 10 1903 (10.0.18362) + # or if OS codepage is set to UTF8 + my($os_name, $os_major, $os_minor, $os_build, $os_id) = Win32::GetOSVersion(); + if($os_major lt 10){ + return 0; + } elsif($os_major gt 10 or $os_minor gt 0 or $os_build ge 18362){ + return 1; + } elsif(Win32::GetACP() eq 65001) { + return 1; + } + return 0; + } + return 1; + } + + $skip{'include/check_utf8_cli.inc'} = 'No utf8 command line support' + unless utf8_command_line_ok(); + + $skip{'include/no_utf8_cli.inc'} = 'Not tested with utf8 command line support' + unless !utf8_command_line_ok(); %skip; } -- cgit v1.2.1 From 74f2e6c85e892b6b9e8d65d14db3246d34cc6fc7 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 24 Nov 2021 10:15:11 +0100 Subject: MDEV-26713 Add test for mysql_install_db creating service, with i18 --- mysql-test/suite.pm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mysql-test/suite.pm') diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index ad67117a229..f30cc5ec431 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -109,6 +109,9 @@ sub skip_combinations { $skip{'include/no_utf8_cli.inc'} = 'Not tested with utf8 command line support' unless !utf8_command_line_ok(); + + $skip{'include/check_windows_admin.inc'} = 'Requires admin privileges' + unless IS_WINDOWS and Win32::IsAdminUser(); %skip; } -- cgit v1.2.1