Skip to content

Commit 90a1cda

Browse files
committed
Bug#25873398 MTR error_log temporary table column line must accept all
possible encodings. We do that by using latin1 which will allow all possible bytes. Reviewed by [email protected]
1 parent a0f6a14 commit 90a1cda

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

mysql-test/include/check-warnings.test

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
33
#
44
# This test is executed once after each test to check the servers
55
# for unexpected warnings found in the servers error log
@@ -46,7 +46,7 @@ create temporary table error_log (
4646
row int auto_increment primary key,
4747
suspicious int default 1,
4848
file_name varchar(255),
49-
line varchar(1024) default null
49+
line varchar(1024) charset latin1 default null
5050
) engine=myisam;
5151
COMMIT;
5252

@@ -60,6 +60,7 @@ let $log_warning= $log_error.warnings;
6060
# an attempt to load the file using LOAD DATA LOCAL is made
6161
--error 0,1290
6262
eval load data infile '$log_warning' into table error_log
63+
character set latin1
6364
fields terminated by 'xykls37' escaped by ''
6465
ignore 1 lines
6566
(line)
@@ -69,6 +70,7 @@ if ($mysql_errno)
6970
{
7071
# Try LOAD DATA LOCAL
7172
eval load data local infile '$log_warning' into table error_log
73+
character set latin1
7274
fields terminated by 'xykls37' escaped by ''
7375
ignore 1 lines
7476
(line)

0 commit comments

Comments
 (0)