diff options
| author | unknown <istruewing@chilla.local> | 2006-12-04 19:03:01 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-12-04 19:03:01 +0100 |
| commit | e9c2c8bad992b59484f96fb6f388161d90bb796d (patch) | |
| tree | ee0de4cfca72227c54212996df61fce09d7b3881 /sql/ha_federated.cc | |
| parent | d337e90e8c9422a98e502e71d73326a428ed8cfa (diff) | |
| parent | 85b1701ab7292eeee4ce4b253909ae68345be43c (diff) | |
| download | mariadb-git-e9c2c8bad992b59484f96fb6f388161d90bb796d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into chilla.local:/home/mydev/mysql-5.0-axmrg
sql/ha_federated.cc:
Auto merged
Diffstat (limited to 'sql/ha_federated.cc')
| -rw-r--r-- | sql/ha_federated.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index 04d607fe4af..ad144ed6118 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -1249,7 +1249,6 @@ bool ha_federated::create_where_from_key(String *to, if (tmp.append(FEDERATED_CLOSEPAREN)) DBUG_RETURN(1); -next_loop: if (store_length >= length) break; DBUG_PRINT("info", ("remainder %d", remainder)); @@ -1925,8 +1924,8 @@ int ha_federated::delete_row(const byte *buf) { DBUG_RETURN(stash_remote_error()); } - deleted+= mysql->affected_rows; - records-= mysql->affected_rows; + deleted+= (ha_rows) mysql->affected_rows; + records-= (ha_rows) mysql->affected_rows; DBUG_PRINT("info", ("rows deleted %ld rows deleted for all time %ld", (long) mysql->affected_rows, (long) deleted)); @@ -2281,7 +2280,6 @@ int ha_federated::rnd_next(byte *buf) int ha_federated::read_next(byte *buf, MYSQL_RES *result) { int retval; - my_ulonglong num_rows; MYSQL_ROW row; DBUG_ENTER("ha_federated::read_next"); |