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
This commit is contained in:
unknown 2008-03-28 16:01:05 -04:00
commit 219c7a2a47
19 changed files with 1754 additions and 1444 deletions

View file

@ -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)
{