diff options
| author | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-11-02 14:35:42 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-11-02 14:35:42 +0400 |
| commit | 56ddb5350b7e73e4e1868d697a22727ecc94af90 (patch) | |
| tree | 3d8a23d481a06230f0c10f061f7021c084860ae6 /client/mysql.cc | |
| parent | 270d4c9ded4cd76a3cbbb24aa337bac8676a1ea4 (diff) | |
| parent | 9d85df0beec1ff4afa6faf4c8eed616e51f9683d (diff) | |
| download | mariadb-git-56ddb5350b7e73e4e1868d697a22727ecc94af90.tar.gz | |
Merge mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
into mysql.com:/usr/home/ram/work/bug22913/my51-bug22913
client/mysql.cc:
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 1dbdeb8be97..a43a4c00979 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2091,6 +2091,8 @@ com_go(String *buffer,char *line __attribute__((unused))) (long) mysql_num_rows(result), (long) mysql_num_rows(result) == 1 ? "row" : "rows"); end_pager(); + if (mysql_errno(&mysql)) + error= put_error(&mysql); } } else if (mysql_affected_rows(&mysql) == ~(ulonglong) 0) |