Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint

into  mysql.com:/usr/home/ram/work/bug22913/my41-bug22913

client/mysql.cc

@@ -2012,6 +2012,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)