summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authorramil/ram@mysql.com/myoffice.izhnet.ru <>2006-11-02 16:20:52 +0400
committerramil/ram@mysql.com/myoffice.izhnet.ru <>2006-11-02 16:20:52 +0400
commit82ec5bd111e92a634a97a182dbed31c8e39f2be2 (patch)
tree704ce4ccb0fdcf8d2c2343ced8967d3727aa97f7 /client/mysql.cc
parent35b833eb86c8e98cec2e9d3ca89e10035cd99ebb (diff)
parent9361705934f3531f341d7e14ca6590668a807ac0 (diff)
downloadmariadb-git-82ec5bd111e92a634a97a182dbed31c8e39f2be2.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc2
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)