summaryrefslogtreecommitdiff
path: root/storage/federated
diff options
context:
space:
mode:
authorbaker@bk-internal.mysql.com <>2006-11-28 22:22:52 +0100
committerbaker@bk-internal.mysql.com <>2006-11-28 22:22:52 +0100
commitf175a892abbf32669fb7760d6177097d99f3b7ec (patch)
tree17cbf7ddda5df51cd125e1aa56feb16b130192da /storage/federated
parent16b79adf39158a3a029d3f9bb77144c8c12f2313 (diff)
parent9de58810eb7eb159e08a3b5873c3e4d9321d9622 (diff)
downloadmariadb-git-f175a892abbf32669fb7760d6177097d99f3b7ec.tar.gz
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
Diffstat (limited to 'storage/federated')
-rw-r--r--storage/federated/ha_federated.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index dea1525b4ea..693544dde36 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -552,8 +552,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;
}
@@ -619,7 +619,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
@@ -1742,7 +1742,7 @@ void ha_federated::update_auto_increment(void)
thd->first_successful_insert_id_in_cur_stmt=
mysql->last_used_con->insert_id;
- DBUG_PRINT("info",("last_insert_id %d", stats.auto_increment_value));
+ DBUG_PRINT("info",("last_insert_id: %ld", (long) stats.auto_increment_value));
DBUG_VOID_RETURN;
}
@@ -1848,6 +1848,7 @@ int ha_federated::update_row(const byte *old_data, byte *new_data)
String where_string(where_buffer,
sizeof(where_buffer),
&my_charset_bin);
+ byte *record= table->record[0];
DBUG_ENTER("ha_federated::update_row");
/*
set string lengths to 0 to avoid misc chars in string
@@ -1906,7 +1907,7 @@ int ha_federated::update_row(const byte *old_data, byte *new_data)
bool needs_quote= (*field)->str_needs_quotes();
where_string.append(STRING_WITH_LEN(" = "));
(*field)->val_str(&field_value,
- (char*) (old_data + (*field)->offset()));
+ (char*) (old_data + (*field)->offset(record)));
if (needs_quote)
where_string.append('\'');
field_value.print(&where_string);
@@ -2014,8 +2015,8 @@ int ha_federated::delete_row(const byte *buf)
stats.deleted+= (ha_rows)mysql->affected_rows;
stats.records-= (ha_rows)mysql->affected_rows;
DBUG_PRINT("info",
- ("rows deleted %d rows deleted for all time %d",
- int(mysql->affected_rows), stats.deleted));
+ ("rows deleted %ld rows deleted for all time %ld",
+ (long) mysql->affected_rows, (long) stats.deleted));
DBUG_RETURN(0);
}
@@ -2148,7 +2149,7 @@ error:
int ha_federated::index_init(uint keynr, bool sorted)
{
DBUG_ENTER("ha_federated::index_init");
- DBUG_PRINT("info", ("table: '%s' key: %u", table->s->table_name, keynr));
+ DBUG_PRINT("info", ("table: '%s' key: %u", table->s->table_name.str, keynr));
active_index= keynr;
DBUG_RETURN(0);
}