mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge rama.(none):/home/jimw/my/mysql-5.0-clean
into rama.(none):/home/jimw/my/mysql-5.1-clean
This commit is contained in:
@ -6946,8 +6946,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);
|
||||
@ -6955,7 +6956,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
|
||||
|
Reference in New Issue
Block a user