diff options
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/lib/v1/mysql-test-run.pl | 2 | ||||
| -rw-r--r-- | mysql-test/suite/maria/r/maria-recovery2.result | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index 174de23c530..ddd6e6d936a 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -3970,7 +3970,7 @@ sub mysqld_arguments ($$$$) { } } - mtr_add_arg($args, "%s--character-set-server-set=latin1", $prefix); + mtr_add_arg($args, "%s--character-set-server=latin1", $prefix); mtr_add_arg($args, "%s--language=%s", $prefix, $path_language); mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix); diff --git a/mysql-test/suite/maria/r/maria-recovery2.result b/mysql-test/suite/maria/r/maria-recovery2.result index 88db518254f..bca6d0d7c74 100644 --- a/mysql-test/suite/maria/r/maria-recovery2.result +++ b/mysql-test/suite/maria/r/maria-recovery2.result @@ -136,7 +136,7 @@ ERROR HY000: Lost connection to MySQL server during query * recovery happens check table t_corrupted1 extended; Table Op Msg_type Msg_text -mysqltest.t_corrupted1 check warning Table is marked as crashed and last repair failed +mysqltest.t_corrupted1 check warning Last repair was aborted before finishing mysqltest.t_corrupted1 check status OK * testing that checksum after recovery is as expected Checksum-check |