diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-12-21 09:44:08 +0100 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-12-21 09:44:08 +0100 |
| commit | b54f4926624ac511106dbda6ec402da09a440c7a (patch) | |
| tree | f6c0a15235cd3d4c407ee3e3e774c60b93f3a813 /client | |
| parent | 396302b5afebf5ca74cfc2d7800df8e2c9e3b434 (diff) | |
| parent | 076d25220d8d5f38393b73449642db871caeeb3f (diff) | |
| download | mariadb-git-b54f4926624ac511106dbda6ec402da09a440c7a.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
client/mysql.cc:
Auto merged
Diffstat (limited to 'client')
| -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 d30b60732bc..8f118a06935 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1290,9 +1290,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++) { @@ -1382,7 +1380,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)) { |