diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-02 16:20:52 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-02 16:20:52 +0400 |
| commit | fb81240f7c54eaf4c68070a979a279c8b53f7ab1 (patch) | |
| tree | 704ce4ccb0fdcf8d2c2343ced8967d3727aa97f7 /client/mysql.cc | |
| parent | 35f18203585d569a6df941536159b0806a19f8ff (diff) | |
| parent | 9d85df0beec1ff4afa6faf4c8eed616e51f9683d (diff) | |
| download | mariadb-git-fb81240f7c54eaf4c68070a979a279c8b53f7ab1.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
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 bc00b51ed93..d0965588b80 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2124,6 +2124,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) |