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

sql_select.cc:

Browse Source 
Renamed variable, to avoid name clash with macro "rem_size"
  on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
asn.cpp, asn.hpp:
  Avoid name clash with NAME_MAX


sql/sql_select.cc:
  Renamed variable, to avoid name clash with macro "rem_size"
  on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
extra/yassl/taocrypt/src/asn.cpp:
  Avoid name clash with NAME_MAX
extra/yassl/taocrypt/include/asn.hpp:
  Avoid name clash with NAME_MAX
This commit is contained in:
unknown
2006-07-28 21:26:46 +02:00
parent a7ba5b75a6
commit 8d73c0b392
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_select.cc
View File

@ -4131,14 +4131,14 @@ greedy_search(JOIN *join,
double read_time= 0.0;
uint idx= join->const_tables; // index into 'join->best_ref'
uint best_idx;
uint rem_size; // cardinality of remaining_tables
uint size_remain; // cardinality of remaining_tables
POSITION best_pos;
JOIN_TAB *best_table; // the next plan node to be added to the curr QEP
DBUG_ENTER("greedy_search");
/* number of tables that remain to be optimized */
rem_size= my_count_bits(remaining_tables);
size_remain= my_count_bits(remaining_tables);
do {
/* Find the extension of the current QEP with the lowest cost */
@ -4146,7 +4146,7 @@ greedy_search(JOIN *join,
best_extension_by_limited_search(join, remaining_tables, idx, record_count,
read_time, search_depth, prune_level);
if (rem_size <= search_depth)
if (size_remain <= search_depth)
{
/*
'join->best_positions' contains a complete optimal extension of the
@ -4182,7 +4182,7 @@ greedy_search(JOIN *join,
read_time+= join->positions[idx].read_time;
remaining_tables&= ~(best_table->table->map);
--rem_size;
--size_remain;
++idx;
DBUG_EXECUTE("opt", print_plan(join, join->tables,