diff options
| -rw-r--r-- | client/mysqltest.c | 32 | ||||
| -rw-r--r-- | mysql-test/r/mysqltest.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/mysqltest.test | 7 |
3 files changed, 11 insertions, 31 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index c678f5e714d..3f24d23a13f 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -8094,8 +8094,6 @@ uint replace_len(char * str) uint len=0; while (*str) { - if (str[0] == '\\' && str[1]) - str++; str++; len++; } @@ -8194,35 +8192,7 @@ REPLACE *init_replace(char * *from, char * *to,uint count, } for (pos=from[i], len=0; *pos ; pos++) { - if (*pos == '\\' && *(pos+1)) - { - pos++; - switch (*pos) { - case 'b': - follow_ptr->chr = SPACE_CHAR; - break; - case '^': - follow_ptr->chr = START_OF_LINE; - break; - case '$': - follow_ptr->chr = END_OF_LINE; - break; - case 'r': - follow_ptr->chr = '\r'; - break; - case 't': - follow_ptr->chr = '\t'; - break; - case 'v': - follow_ptr->chr = '\v'; - break; - default: - follow_ptr->chr = (uchar) *pos; - break; - } - } - else - follow_ptr->chr= (uchar) *pos; + follow_ptr->chr= (uchar) *pos; follow_ptr->table_offset=i; follow_ptr->len= ++len; follow_ptr++; diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 48eb0bf5cc0..adf99185d89 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -725,4 +725,7 @@ drop table t1; mysqltest: At line 1: change user failed: Unknown database 'inexistent' mysqltest: At line 1: change user failed: Access denied for user 'inexistent'@'localhost' (using password: NO) mysqltest: At line 1: change user failed: Access denied for user 'root'@'localhost' (using password: YES) +SELECT 'c:\\a.txt' AS col; +col +z End of tests diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 5856bfff036..b41f033d2af 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -2123,6 +2123,13 @@ rmdir $MYSQLTEST_VARDIR/tmp/testdir; remove_file $MYSQLTEST_VARDIR/tmp/testdir/file1.txt; rmdir $MYSQLTEST_VARDIR/tmp/testdir; +# +# Bug #36041: mysql-test-run doesn't seem to string match 100% effectively +# on Windows +# + +--replace_result c:\\a.txt z +SELECT 'c:\\a.txt' AS col; --echo End of tests |