diff options
author | unknown <iggy@amd64.(none)> | 2008-03-28 16:01:05 -0400 |
---|---|---|
committer | unknown <iggy@amd64.(none)> | 2008-03-28 16:01:05 -0400 |
commit | 219c7a2a4712ea829d24378eb34288b3563231d6 (patch) | |
tree | 7bc62903e7cf887e446a8dd7c0e348d785518e72 /sql/ha_federated.cc | |
parent | afb4ac4545e07de958ca8721e1b7891ee4c0b955 (diff) | |
parent | a9089cf460c7d7be3d8b843c948f0c707822878e (diff) | |
download | mariadb-git-219c7a2a4712ea829d24378eb34288b3563231d6.tar.gz |
Merge amd64.(none):/src/mysql-5.0-bugteam
into amd64.(none):/src/bug26243/my50-bug26243
libmysql/libmysql.c:
Auto merged
myisam/mi_open.c:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'sql/ha_federated.cc')
-rw-r--r-- | sql/ha_federated.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index d414dc34f02..7a7d65a3d34 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -1095,7 +1095,7 @@ bool ha_federated::create_where_from_key(String *to, uint store_length= key_part->store_length; uint part_length= min(store_length, length); needs_quotes= 1; - DBUG_DUMP("key, start of loop", (char *) ptr, length); + DBUG_DUMP("key, start of loop", ptr, length); if (key_part->null_bit) { |