diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-12-21 09:40:53 +0100 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-12-21 09:40:53 +0100 |
| commit | 076d25220d8d5f38393b73449642db871caeeb3f (patch) | |
| tree | 5890e766236fb8400a04e372ff64431f85862235 | |
| parent | 69759e4f006f699a0fbe6fa6a1e1363e6db1ff70 (diff) | |
| parent | 6dd1f417d32c8d545997fba0e4b7cbb7d64f6e64 (diff) | |
| download | mariadb-git-076d25220d8d5f38393b73449642db871caeeb3f.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-33288-33057
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
| -rw-r--r-- | client/mysql.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 999a37e0f7e..6744600aadb 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1272,9 +1272,7 @@ static bool add_line(String &buffer,char *line,char *in_string, if (status.add_to_history && line[0] && not_in_history(line)) add_history(line); #endif -#ifdef USE_MB char *end_of_line=line+(uint) strlen(line); -#endif for (pos=out=line ; (inchar= (uchar) *pos) ; pos++) { @@ -1364,7 +1362,7 @@ static bool add_line(String &buffer,char *line,char *in_string, } } else if (!*ml_comment && !*in_string && - strlen(pos) >= 10 && + (end_of_line - pos) >= 10 && !my_strnncoll(charset_info, (uchar*) pos, 10, (const uchar*) "delimiter ", 10)) { |