diff options
| author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
| commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
| tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/mysql_comments.test | |
| parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
| parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
| download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/mysql_comments.test')
| -rw-r--r-- | mysql-test/main/mysql_comments.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/mysql_comments.test b/mysql-test/main/mysql_comments.test index 338fe8dc6b9..1ee88553a8f 100644 --- a/mysql-test/main/mysql_comments.test +++ b/mysql-test/main/mysql_comments.test @@ -1,5 +1,6 @@ # This test should work in embedded server after we fix mysqltest -- source include/not_embedded.inc + ###################### mysql_comments.test ############################# # # # Testing of comments handling by the command line client (mysql) # @@ -31,13 +32,12 @@ drop trigger if exists t1_bi; # Test without comments --echo "Pass 1 : --disable-comments" --replace_regex /[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}(.[0-9]{2})*/--TIME--/ ---exec $MYSQL --disable-comments test 2>&1 < "./main/mysql_comments.sql" +--exec $MYSQL --default-character-set=latin1 --disable-comments test 2>&1 < "./main/mysql_comments.sql" # Test with comments --echo "Pass 2 : --enable-comments" --replace_regex /[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}(.[0-9]{2})*/--TIME--/ ---exec $MYSQL --enable-comments test 2>&1 < "./main/mysql_comments.sql" - +--exec $MYSQL --default-character-set=latin1 --enable-comments test 2>&1 < "./main/mysql_comments.sql" set global sql_mode=default; --echo End of 5.0 tests |