diff options
| author | unknown <istruewing@chilla.local> | 2006-12-01 18:49:20 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-12-01 18:49:20 +0100 |
| commit | d337e90e8c9422a98e502e71d73326a428ed8cfa (patch) | |
| tree | 12995f9fdafb30efcae4cd586d3d6edc776be2b1 /sql/ha_federated.cc | |
| parent | ec74c400648255d482f357339ff7f3a7cb102ebd (diff) | |
| parent | a4342155a549fd527b761b36311a87ea3f863efb (diff) | |
| download | mariadb-git-d337e90e8c9422a98e502e71d73326a428ed8cfa.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into chilla.local:/home/mydev/mysql-5.0-axmrg
configure.in:
Auto merged
myisam/mi_dynrec.c:
Auto merged
sql/ha_federated.cc:
Auto merged
Diffstat (limited to 'sql/ha_federated.cc')
| -rw-r--r-- | sql/ha_federated.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index 923ee7a232f..04d607fe4af 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -557,8 +557,8 @@ static int parse_url_error(FEDERATED_SHARE *share, TABLE *table, int error_num) if (share->scheme) { DBUG_PRINT("info", - ("error: parse_url. Returning error code %d \ - freeing share->scheme %lx", error_num, share->scheme)); + ("error: parse_url. Returning error code %d freeing share->scheme 0x%lx", + error_num, (long) share->scheme)); my_free((gptr) share->scheme, MYF(0)); share->scheme= 0; } @@ -624,7 +624,7 @@ static int parse_url(FEDERATED_SHARE *share, TABLE *table, MYF(0)); share->connect_string_length= table->s->connect_string.length; - DBUG_PRINT("info",("parse_url alloced share->scheme %lx", share->scheme)); + DBUG_PRINT("info",("parse_url alloced share->scheme 0x%lx", (long) share->scheme)); /* remove addition of null terminator and store length @@ -1675,7 +1675,7 @@ void ha_federated::update_auto_increment(void) DBUG_ENTER("ha_federated::update_auto_increment"); thd->insert_id(mysql->last_used_con->insert_id); - DBUG_PRINT("info",("last_insert_id %d", auto_increment_value)); + DBUG_PRINT("info",("last_insert_id: %ld", (long) auto_increment_value)); DBUG_VOID_RETURN; } @@ -1928,8 +1928,8 @@ int ha_federated::delete_row(const byte *buf) deleted+= mysql->affected_rows; records-= mysql->affected_rows; DBUG_PRINT("info", - ("rows deleted %d rows deleted for all time %d", - int(mysql->affected_rows), deleted)); + ("rows deleted %ld rows deleted for all time %ld", + (long) mysql->affected_rows, (long) deleted)); DBUG_RETURN(0); } |