database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge bk-internal:/home/bk/mysql-5.0-maint

Browse Source 
into  rama.(none):/home/jimw/my/mysql-5.0-clean


include/my_global.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
This commit is contained in:
unknown
2006-09-28 20:17:17 -07:00
parent 5b571b5b5b 00820e2b0a
commit 39bdf4c41c
12 changed files with 60 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/opt_range.cc
View File

@@ -5559,8 +5559,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);
@@ -5568,7 +5569,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