diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 08:56:10 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-19 08:56:10 +0300 |
| commit | 192aa295b4bc877d0fed24154c57304c3f789179 (patch) | |
| tree | 893239effa9f3c9a7d00b324de9b4e41c63bdb4d /mysql-test/main | |
| parent | 03f3ba2dcb07a672f9c1d87489b9ec88af62a96f (diff) | |
| parent | 8acbf9c1f961aa1008ef509e059e1a09943f5ed3 (diff) | |
| download | mariadb-git-192aa295b4bc877d0fed24154c57304c3f789179.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/charset_client_win.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/charset_client_win.test | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/main/charset_client_win.result b/mysql-test/main/charset_client_win.result new file mode 100644 index 00000000000..08a32b0b80f --- /dev/null +++ b/mysql-test/main/charset_client_win.result @@ -0,0 +1,2 @@ +@@character_set_client +cp1257 diff --git a/mysql-test/main/charset_client_win.test b/mysql-test/main/charset_client_win.test new file mode 100644 index 00000000000..b4a21d4f0a4 --- /dev/null +++ b/mysql-test/main/charset_client_win.test @@ -0,0 +1,2 @@ +--source include/windows.inc +--exec chcp 1257 > NUL && $MYSQL --default-character-set=auto -e "select @@character_set_client" |