Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
68eb9b1a
Commit
68eb9b1a
authored
Aug 14, 2018
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-16220 Do not pass UTF8 to mysql in command line parameters, on Windows
Moved parts of mysql.test to mysql_not_windows.test
parent
0496bbc1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
6 deletions
+10
-6
mysql-test/r/mysql.result
mysql-test/r/mysql.result
+0
-2
mysql-test/r/mysql_not_windows.result
mysql-test/r/mysql_not_windows.result
+2
-0
mysql-test/t/mysql.test
mysql-test/t/mysql.test
+1
-4
mysql-test/t/mysql_not_windows.test
mysql-test/t/mysql_not_windows.test
+7
-0
No files found.
mysql-test/r/mysql.result
View file @
68eb9b1a
...
@@ -538,8 +538,6 @@ a
...
@@ -538,8 +538,6 @@ a
#
#
# End of 10.1 tests
# End of 10.1 tests
#
#
ERROR 1300 (HY000): Invalid utf8 character string: 'test\xF0\x9F\x98\x81 '
ERROR 1300 (HY000): Invalid binary character string: 'test\xF0\x9F\x98\x81 '
ERROR 1300 (HY000) at line 2: Invalid utf8 character string: 'test\xF0\x9F\x98\x81'
ERROR 1300 (HY000) at line 2: Invalid utf8 character string: 'test\xF0\x9F\x98\x81'
set GLOBAL sql_mode=default;
set GLOBAL sql_mode=default;
...
...
mysql-test/r/mysql_not_windows.result
View file @
68eb9b1a
...
@@ -9,3 +9,5 @@ End of tests
...
@@ -9,3 +9,5 @@ End of tests
2
2
X
X
3
3
ERROR 1300 (HY000): Invalid utf8 character string: 'test\xF0\x9F\x98\x81 '
ERROR 1300 (HY000): Invalid binary character string: 'test\xF0\x9F\x98\x81 '
mysql-test/t/mysql.test
View file @
68eb9b1a
...
@@ -638,10 +638,7 @@ EOF
...
@@ -638,10 +638,7 @@ EOF
--
echo
# End of 10.1 tests
--
echo
# End of 10.1 tests
--
echo
#
--
echo
#
--
error
1
--
exec
$MYSQL
--
default
-
character
-
set
=
utf8
-
e
"select 1"
"test😁 "
2
>&
1
--
error
1
--
exec
$MYSQL
--
default
-
character
-
set
=
binary
-
e
"select 1"
"test😁 "
2
>&
1
--
write_file
$MYSQLTEST_VARDIR
/
tmp
/
mdev
-
6572.
sql
--
write_file
$MYSQLTEST_VARDIR
/
tmp
/
mdev
-
6572.
sql
SET
NAMES
utf8
;
SET
NAMES
utf8
;
USE
test
😁
;
USE
test
😁
;
...
...
mysql-test/t/mysql_not_windows.test
View file @
68eb9b1a
...
@@ -22,3 +22,10 @@ exec $MYSQL test -e "select
...
@@ -22,3 +22,10 @@ exec $MYSQL test -e "select
let
$query
=
select
3
let
$query
=
select
3
as
X
;
as
X
;
exec
$MYSQL
test
-
e
"
$query
"
;
exec
$MYSQL
test
-
e
"
$query
"
;
# Not ran on Windows, since non-ASCII does not work on command line.
# (MDEV-16220)
--
error
1
--
exec
$MYSQL
--
default
-
character
-
set
=
utf8
-
e
"select 1"
"test😁 "
2
>&
1
--
error
1
--
exec
$MYSQL
--
default
-
character
-
set
=
binary
-
e
"select 1"
"test😁 "
2
>&
1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment