database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

merged

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
ltmain.sh:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2001-08-09 19:16:15 -06:00
parent 4bb4018743 ebb3bd0f75
commit 9a6a7bf5f6
102 changed files with 3488 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_select.cc
View File

@ -2701,12 +2701,12 @@ static void update_depend_map(JOIN *join)
for (i=0 ; i < ref->key_parts ; i++,item++)
depend_map|=(*item)->used_tables();
ref->depend_map=depend_map;
for (JOIN_TAB *join_tab2=join->join_tab;
for (JOIN_TAB **tab=join->map2table;
depend_map ;
join_tab2++,depend_map>>=1 )
tab++,depend_map>>=1 )
{
if (depend_map & 1)
ref->depend_map|=join_tab2->ref.depend_map;
ref->depend_map|=(*tab)->ref.depend_map;
}
}
}
@ -2723,12 +2723,12 @@ static void update_depend_map(JOIN *join, ORDER *order)
order->depend_map=depend_map=order->item[0]->used_tables();
if (!(order->depend_map & RAND_TABLE_BIT)) // Not item_sum() or RAND()
{
for (JOIN_TAB *join_tab=join->join_tab;
for (JOIN_TAB **tab=join->map2table;
depend_map ;
join_tab++, depend_map>>=1)
tab++, depend_map>>=1)
{
if (depend_map & 1)
order->depend_map|=join_tab->ref.depend_map;
order->depend_map|=(*tab)->ref.depend_map;
}
}
}
@ -5552,6 +5552,7 @@ static int remove_dup_with_compare(THD *thd, TABLE *table, Field **first_field,
{
if ((error=file->delete_row(record)))
goto err;
error=file->rnd_next(record);
continue;
}
if (copy_blobs(first_field))
@ -6063,7 +6064,7 @@ setup_group(THD *thd,TABLE_LIST *tables,List<Item> &fields,
if (!order)
return 0; /* Everything is ok */
if (thd->options & OPTION_ANSI_MODE)
if (thd->sql_mode & MODE_ONLY_FULL_GROUP_BY)
{
Item *item;
List_iterator<Item> li(fields);
@ -6085,7 +6086,7 @@ setup_group(THD *thd,TABLE_LIST *tables,List<Item> &fields,
return 1;
}
}
if (thd->options & OPTION_ANSI_MODE)
if (thd->sql_mode & MODE_ONLY_FULL_GROUP_BY)
{
/* Don't allow one to use fields that is not used in GROUP BY */
Item *item;