diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-02 14:33:22 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-02 14:33:22 +0400 |
| commit | 9d85df0beec1ff4afa6faf4c8eed616e51f9683d (patch) | |
| tree | 9c75ee52ae8cc6be20c45d30266b7adcaaffea9a /client/mysql.cc | |
| parent | d3144a9d6c5aa07b07568cd0d1d808cc9b9b9d89 (diff) | |
| parent | b96f1a477d143dcba5f5d81813c2445c4de345a2 (diff) | |
| download | mariadb-git-9d85df0beec1ff4afa6faf4c8eed616e51f9683d.tar.gz | |
Merge mysql.com:/usr/home/ram/work/bug22913/my41-bug22913
into mysql.com:/usr/home/ram/work/bug22913/my50-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 94b43d030e8..b0db42e0568 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2057,6 +2057,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) |