1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
msvensson@neptunus.(none)
2006-10-03 13:27:48 +02:00
228 changed files with 6214 additions and 4015 deletions

View File

@ -6954,8 +6954,9 @@ void SEL_ARG::test_use_count(SEL_ARG *root)
ulong count=count_key_part_usage(root,pos->next_key_part);
if (count > pos->next_key_part->use_count)
{
sql_print_information("Use_count: Wrong count for key at 0x%lx, %lu should be %lu",
pos,pos->next_key_part->use_count,count);
sql_print_information("Use_count: Wrong count for key at 0x%lx, %lu "
"should be %lu", (long unsigned int)pos,
pos->next_key_part->use_count, count);
return;
}
pos->next_key_part->test_use_count(root);
@ -6963,7 +6964,7 @@ void SEL_ARG::test_use_count(SEL_ARG *root)
}
if (e_count != elements)
sql_print_warning("Wrong use count: %u (should be %u) for tree at 0x%lx",
e_count, elements, (gptr) this);
e_count, elements, (long unsigned int) this);
}
#endif