diff options
| author | unknown <kent@mysql.com> | 2005-10-20 23:23:33 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-10-20 23:23:33 +0200 |
| commit | 9e23aa1126c5fd820969cedd595b9a4b9e1df30e (patch) | |
| tree | 5cc591028d72d798fa923ff01e843847dfa72fa7 /client/mysql.cc | |
| parent | ad731d3888ff0ef87313d41c365a30fdf18cee68 (diff) | |
| parent | e27cb111cd1c451dcba8111c2ed1ca97037dd5ad (diff) | |
| download | mariadb-git-9e23aa1126c5fd820969cedd595b9a4b9e1df30e.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
client/mysql.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 3882b61b9ad..bf417e73e22 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1010,10 +1010,12 @@ static int read_and_execute(bool interactive) #elif defined(__WIN__) if (!tmpbuf.is_alloced()) tmpbuf.alloc(65535); + tmpbuf.length(0); buffer.length(0); unsigned long clen; do { + line= my_cgets((char*)tmpbuf.ptr(), tmpbuf.alloced_length()-1, &clen); buffer.append(line, clen); /* if we got buffer fully filled than there is a chance that |