diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-11-08 15:55:25 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-11-08 15:55:25 +0100 |
| commit | 020600a4ed6af27798173a3f62b5e6786c4b9ea3 (patch) | |
| tree | 1bca0f09e140ea3705bd3886be8bd8ce172644a3 /mysql-test/r/mysqltest.result | |
| parent | 40f42cac72a93c0836373619ed1344a5c38faf13 (diff) | |
| download | mariadb-git-020600a4ed6af27798173a3f62b5e6786c4b9ea3.tar.gz | |
Bug #13055685 NO WAY TO REPLACE NON-DETERMINISTIC FRAGMENTS IN OUTPUT OF MTR'S ECHO
Don't do this for echo, instead:
1) Enable replacements also for assignment from backquoted SQL
2) Allow replace_regex to take a variable for the *entire* argument list
With this, the test can be amended, but only in its version in trunk
Diffstat (limited to 'mysql-test/r/mysqltest.result')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index a0456c65f53..82069ebedaf 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -549,6 +549,7 @@ mysqltest: At line 1: Wrong column number to replace_column in 'replace_column 1 select "LONG_STRING" as x; x LONG_STRING +dog mysqltest: At line 1: Invalid integer argument "10!" mysqltest: At line 1: Invalid integer argument "a" mysqltest: At line 1: Missing required argument 'connection name' to command 'connect' @@ -662,6 +663,11 @@ a D 1 1 1 4 drop table t1; +y +txt +b is b and more is more +txt +a is a and less is more create table t2 ( a char(10)); garbage; ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1 |