diff options
| author | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-11-02 14:42:45 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-11-02 14:42:45 +0400 |
| commit | 13f4a3e6e82030fd8ad01b75191abe448617c3e9 (patch) | |
| tree | 5f2b8e88180f38a71834e71c9e6467ea150b9071 /client | |
| parent | 5b063712f0cf7d6a11438705b08a0a7c53c8f694 (diff) | |
| parent | 56ddb5350b7e73e4e1868d697a22727ecc94af90 (diff) | |
| download | mariadb-git-13f4a3e6e82030fd8ad01b75191abe448617c3e9.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/usr/home/ram/work/bug22913/my51-bug22913
client/mysql.cc:
Auto merged
Diffstat (limited to 'client')
| -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 ea2c8663bb1..486e5bc113c 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2106,6 +2106,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) |