From 010273268665746e188324e49730704c83aa8752 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Fri, 19 Nov 2021 09:46:57 +0100 Subject: Revert "MDEV-26713 Windows - improve utf8 support for command line tools" This reverts commit several commits pushed by mistake. --- mysql-test/suite.pm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'mysql-test/suite.pm') diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 8dc76283fc6..4cc6b410fa1 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -87,23 +87,6 @@ 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) - 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; - } - return 0; - } - return 1; - } - - $skip{'main/charset_client_win_utf8mb4.test'} = - $skip{'main/grant_utf8_cli.test'} = 'No utf8 command line support' - unless utf8_command_line_ok(); %skip; } -- cgit v1.2.1