diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | client/mysql.cc | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 86fcc8687d7..9fecdc743db 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -50,6 +50,7 @@ jani@janikt.pp.saunalahti.fi jani@rhols221.adsl.netsonic.fi jani@rhols221.arenanet.fi jani@ua126d19.elisa.omakaista.fi +jani@ua167d18.elisa.omakaista.fi jcole@abel.spaceapes.com jcole@main.burghcom.com jcole@mugatu.spaceapes.com diff --git a/client/mysql.cc b/client/mysql.cc index f1921fbbe82..059a1ad36f5 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1621,7 +1621,8 @@ com_go(String *buffer,char *line __attribute__((unused))) char buff[200], time_buff[32], *pos; MYSQL_RES *result; ulong timer, warnings; - uint error=0; + uint error= 0; + int err= 0; if (!status.batch) { @@ -1739,7 +1740,9 @@ com_go(String *buffer,char *line __attribute__((unused))) else if (unbuffered) fflush(stdout); mysql_free_result(result); - } while (!mysql_next_result(&mysql)); + } while (!(err= mysql_next_result(&mysql))); + if (err >= 1) + error= put_error(&mysql); return error; /* New command follows */ } |