diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-05-01 16:34:14 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-05-01 16:34:14 +0300 |
| commit | a2c99f5977159611fa5b3a1dc2a09e78f9dc5b7f (patch) | |
| tree | aa33cbb12f0ac4a780b1e1131388995c67629a64 /client | |
| parent | 4f3549638a65a1f6781d2fc40073d0cbe3867259 (diff) | |
| parent | 6e6d60732b3091e243b98fe79025c3c1dba70db7 (diff) | |
| download | mariadb-git-a2c99f5977159611fa5b3a1dc2a09e78f9dc5b7f.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into magare.gmz:/home/kgeorge/mysql/autopush/B36041-5.1-bugteam
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 32 |
1 files changed, 1 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++; |