Revert "MDEV-26713 Windows - improve utf8 support for command line tools"st-10.8-wlad

This reverts commit several commits pushed by mistake.

6 files changed, 3 insertions, 22 deletions

diff --git a/mysql-test/main/charset_client_win.test b/mysql-test/main/charset_client_win.test
index dd0162ca23a..b4a21d4f0a4 100644
--- a/mysql-test/main/charset_client_win.test
+++ b/mysql-test/main/charset_client_win.test
@@ -1,2 +1,2 @@
 --source include/windows.inc
---exec set MARIADB_DISABLE_UTF8_CONSOLE=1 && chcp 1257 > NUL && $MYSQL --default-character-set=auto -e "select @@character_set_client"
+--exec chcp 1257 > NUL && $MYSQL --default-character-set=auto -e "select @@character_set_client"
diff --git a/mysql-test/main/charset_client_win_utf8mb4.result b/mysql-test/main/charset_client_win_utf8mb4.result
deleted file mode 100644
index f7b5d376f9a..00000000000
--- a/mysql-test/main/charset_client_win_utf8mb4.result
+++ /dev/null
@@ -1,2 +0,0 @@
-@@character_set_client
-utf8mb4
diff --git a/mysql-test/main/charset_client_win_utf8mb4.test b/mysql-test/main/charset_client_win_utf8mb4.test
deleted file mode 100644
index 3a4b486632d..00000000000
--- a/mysql-test/main/charset_client_win_utf8mb4.test
+++ /dev/null
@@ -1,2 +0,0 @@
---source include/windows.inc
---exec $MYSQL --default-character-set=auto -e "select @@character_set_client"
diff --git a/mysql-test/main/grant_utf8_cli.result b/mysql-test/main/grant_not_windows.result
index fedfaf984b2..fedfaf984b2 100644
--- a/mysql-test/main/grant_utf8_cli.result
+++ b/mysql-test/main/grant_not_windows.result
diff --git a/mysql-test/main/grant_utf8_cli.test b/mysql-test/main/grant_not_windows.test
index 97d9fdbff40..55b09232edc 100644
--- a/mysql-test/main/grant_utf8_cli.test
+++ b/mysql-test/main/grant_not_windows.test
@@ -1,3 +1,5 @@
+ # UTF8 parameters to mysql client do not work on Windows
+--source include/not_windows.inc
 --source include/not_embedded.inc
 
 #
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;
 }