diff options
| author | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-12-17 09:48:30 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@mysql.com/white.intern.koehntopp.de> | 2007-12-17 09:48:30 +0100 |
| commit | adfbe1fb82d43e0e22d56a29cccfe71ff72eb802 (patch) | |
| tree | a1f6b2e88e3c2e89ae3afbbf8fa09f9b650591a3 /client | |
| parent | 734c6286e9b78927aaec9ff9f433747b92a7db57 (diff) | |
| parent | ba0506676b52f2ced84c5064f5358c57ba0ba603 (diff) | |
| download | mariadb-git-adfbe1fb82d43e0e22d56a29cccfe71ff72eb802.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/31752_/51-31752_
client/mysql.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/unireg.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index d30b60732bc..27d8725aefe 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3115,7 +3115,10 @@ com_connect(String *buffer, char *line) Two null bytes are needed in the end of buff to allow get_arg to find end of string the second time it's called. */ - strmake(buff, line, sizeof(buff)-2); + tmp= strmake(buff, line, sizeof(buff)-2); +#ifdef EXTRA_DEBUG + tmp[1]= 0; +#endif tmp= get_arg(buff, 0); if (tmp && *tmp) { |