diff options
| author | unknown <gluh@mysql.com> | 2005-10-07 14:26:32 +0500 |
|---|---|---|
| committer | unknown <gluh@mysql.com> | 2005-10-07 14:26:32 +0500 |
| commit | 03f5718ec58a1f7f6a8d213e8348951b467eda52 (patch) | |
| tree | c03f2d08f3fe7e074c1161c7b038cc19bbd9682b /client | |
| parent | e0fc2b87cc82006b41f6521cc0ac5f357031f391 (diff) | |
| parent | a865516242eb5514206abe22e7f65d843022556c (diff) | |
| download | mariadb-git-03f5718ec58a1f7f6a8d213e8348951b467eda52.tar.gz | |
4.1 -> 5.0 merge
client/mysql.cc:
Auto merged
mysql-test/t/rpl_openssl.test:
Auto merged
mysql-test/r/rpl_openssl.result:
manual merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 65d520fe4b4..2dcfffdd3ac 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1014,7 +1014,6 @@ static int read_and_execute(bool interactive) 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 |