mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
70aa7424c4
(All commit emails since 4.0.1 checked) This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree. BUILD/SETUP.sh: Added -DPEDANTIC_SAFEMALLOC as standard debug option Docs/manual.texi: Changes for new version. client/mysql.cc: Fixed default value for rehash cleanup client/mysqladmin.c: Cleanup client/mysqlbinlog.cc: cleanup client/mysqldump.c: Cleanup client/mysqlmanager-pwgen.c: Cleanup client/mysqlmanagerc.c: Cleanup client/mysqltest.c: Cleanup dbug/dbug.c: Cleanup extra/resolve_stack_dump.c: Cleanup & Simple optimizations include/ft_global.h: Cleanup include/my_alloc.h: Cleanup include/my_global.h: Cleanup include/my_sys.h: Cleanup include/myisam.h: Cleanup libmysql/libmysql.c: Cleanup libmysql/manager.c: Cleanup myisam/ft_boolean_search.c: Cleanup myisam/ft_dump.c: Change strcpy -> strmov myisam/ft_eval.c: Cleanup myisam/ft_nlq_search.c: Cleanup myisam/ft_test1.c: strncpy -> strnmov myisam/ft_update.c: Cleanup myisam/mi_static.c: Cleanup myisam/mi_test2.c: Cleanup myisam/mi_write.c: Cleanup mysys/mf_fn_ext.c: Cleanup mysys/mf_iocache.c: Cleanup mysys/mf_iocache2.c: Cleanup mysys/my_getopt.c: Cleanup mysys/my_read.c: Cleanup mysys/my_thr_init.c: Cleanup mysys/queues.c: Cleanup mysys/safemalloc.c: Cleanup sql/field.cc: Indentation cleanups sql/ha_berkeley.cc: Indentation cleanups sql/ha_myisam.cc: Cleanup sql/item.h: Indentation cleanups sql/item_cmpfunc.cc: Indentation cleanups sql/item_create.cc: cleanup sql/item_func.cc: Cleanup sql/item_func.h: Indentation cleanups sql/item_strfunc.cc: Indentation cleanups sql/item_sum.cc: Indentation cleanups sql/item_timefunc.cc: Indentation cleanups sql/lock.cc: Indentation cleanups sql/log.cc: Cleanup strnmov -> strmake sql/log_event.cc: Cleanup + optimizations Fixed memory leak Added missing pthread_mutex_unlock() (On error condition) sql/log_event.h: Indentation and comment cleanup Merged #ifdef's into common blocks for better readability sql/mini_client.cc: Indentation cleanup sql/mysql_priv.h: Cleanup Changed int function to bool sql/mysqld.cc: Indentation and comment cleanup sql/net_pkg.cc: Indentation cleanup sql/net_serv.cc: Changed int function -> bool sql/nt_servc.cc: Cleanup sql/opt_range.cc: Indentation cleanup sql/repl_failsafe.cc: Cleanup + simple optimization strnmov -> strmake sql/slave.cc: strnmov -> strmake Cleanups sql/slave.h: Cleanup sql/sql_acl.cc: Indentation and DBUG_PRINT cleanup Changed WITH MAX... to not use = sql/sql_base.cc: Indentation cleanup sql/sql_cache.cc: Indentation cleanup sql/sql_class.cc: Indentation cleanup sql/sql_class.h: Renamed some struct slots sql/sql_delete.cc: Indentation cleanup sql/sql_handler.cc: Indentation cleanup sql/sql_insert.cc: Use new slot names. sql/sql_lex.cc: Indentation cleanup sql/sql_lex.h: Indentation cleanup sql/sql_load.cc: Indentation cleanup sql/sql_parse.cc: Indentation cleanup Removed not used check from LOCK TABLES sql/sql_repl.cc: strnmov -> strmake sql/sql_repl.h: Removed test if file is included (We want to know if it's included twice to avoid this) sql/sql_select.cc: Indentation cleanup sql/sql_show.cc: Indentation cleanup sql/sql_string.cc: Indentation cleanup sql/sql_table.cc: Indentation cleanup sql/sql_union.cc: Use renamed struct slot sql/sql_update.cc: Indentation cleanup sql/sql_yacc.yy: Removed = after GRANT ... MAX_ to make the syntax uniform sql/table.cc: Indentation cleanup sql/table.h: Indentation cleanup sql/time.cc: Indentation cleanup sql/udf_example.cc: Indentation cleanup sql/unireg.cc: strnmov -> strmake tests/grant.pl: Added test for LOCK TABLES tools/mysqlmanager.c: Cleanup fopen() -> my_fopen() vio/viosocket.c: DBUG_PRINT cleanups vio/viosslfactories.c: Indentation cleanup Checking of results from malloc() Fixed possible memory leak BitKeeper/etc/ignore: Added scripts/mysql_secure_installation to the ignore list BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
279 lines
7.9 KiB
C++
279 lines
7.9 KiB
C++
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
|
/*
|
|
UNION of select's
|
|
UNION's were introduced by Monty and Sinisa <sinisa@mysql.com>
|
|
*/
|
|
|
|
|
|
#include "mysql_priv.h"
|
|
#include "sql_select.h"
|
|
|
|
|
|
int mysql_union(THD *thd, LEX *lex,select_result *result)
|
|
{
|
|
SELECT_LEX *sl, *last_sl, *lex_sl;
|
|
ORDER *order;
|
|
List<Item> item_list;
|
|
TABLE *table;
|
|
int describe=(lex->select_lex.options & SELECT_DESCRIBE) ? 1 : 0;
|
|
int res;
|
|
bool found_rows_for_union=false;
|
|
TABLE_LIST result_table_list;
|
|
TABLE_LIST *first_table=(TABLE_LIST *)lex->select_lex.table_list.first;
|
|
TMP_TABLE_PARAM tmp_table_param;
|
|
select_union *union_result;
|
|
DBUG_ENTER("mysql_union");
|
|
|
|
/* Fix tables 'to-be-unioned-from' list to point at opened tables */
|
|
last_sl= &lex->select_lex;
|
|
for (sl= last_sl;
|
|
sl && sl->linkage != NOT_A_SELECT;
|
|
last_sl=sl, sl=sl->next)
|
|
{
|
|
for (TABLE_LIST *cursor= (TABLE_LIST *)sl->table_list.first;
|
|
cursor;
|
|
cursor=cursor->next)
|
|
cursor->table= ((TABLE_LIST*) cursor->table)->table;
|
|
}
|
|
|
|
/* last_sel now points at the last select where the ORDER BY is stored */
|
|
if (sl)
|
|
{
|
|
/*
|
|
The found SL is an extra SELECT_LEX argument that contains
|
|
the ORDER BY and LIMIT parameter for the whole UNION
|
|
*/
|
|
lex_sl= sl;
|
|
order= (ORDER *) lex_sl->order_list.first;
|
|
found_rows_for_union = lex->select_lex.options & OPTION_FOUND_ROWS && !describe && sl->select_limit;
|
|
if (found_rows_for_union)
|
|
lex->select_lex.options ^= OPTION_FOUND_ROWS;
|
|
// This is done to eliminate unnecessary slowing down of the first query
|
|
if (!order || !describe)
|
|
last_sl->next=0; // Remove this extra element
|
|
}
|
|
else if (!last_sl->braces)
|
|
{
|
|
lex_sl= last_sl; // ORDER BY is here
|
|
order= (ORDER *) lex_sl->order_list.first;
|
|
}
|
|
else
|
|
{
|
|
lex_sl=0;
|
|
order=0;
|
|
}
|
|
|
|
if (describe)
|
|
{
|
|
Item *item;
|
|
item_list.push_back(new Item_empty_string("table",NAME_LEN));
|
|
item_list.push_back(new Item_empty_string("type",10));
|
|
item_list.push_back(item=new Item_empty_string("possible_keys",
|
|
NAME_LEN*MAX_KEY));
|
|
item->maybe_null=1;
|
|
item_list.push_back(item=new Item_empty_string("key",NAME_LEN));
|
|
item->maybe_null=1;
|
|
item_list.push_back(item=new Item_int("key_len",0,3));
|
|
item->maybe_null=1;
|
|
item_list.push_back(item=new Item_empty_string("ref",
|
|
NAME_LEN*MAX_REF_PARTS));
|
|
item->maybe_null=1;
|
|
item_list.push_back(new Item_real("rows",0.0,0,10));
|
|
item_list.push_back(new Item_empty_string("Extra",255));
|
|
}
|
|
else
|
|
{
|
|
Item *item;
|
|
List_iterator<Item> it(lex->select_lex.item_list);
|
|
TABLE_LIST *first_table= (TABLE_LIST*) lex->select_lex.table_list.first;
|
|
|
|
/* Create a list of items that will be in the result set */
|
|
while ((item= it++))
|
|
if (item_list.push_back(item))
|
|
DBUG_RETURN(-1);
|
|
if (setup_fields(thd,first_table,item_list,0,0,1))
|
|
DBUG_RETURN(-1);
|
|
}
|
|
|
|
bzero((char*) &tmp_table_param,sizeof(tmp_table_param));
|
|
tmp_table_param.field_count=item_list.elements;
|
|
if (!(table=create_tmp_table(thd, &tmp_table_param, item_list,
|
|
(ORDER*) 0, !describe & !lex->union_option,
|
|
1, 0,
|
|
(lex->select_lex.options | thd->options |
|
|
TMP_TABLE_ALL_COLUMNS))))
|
|
DBUG_RETURN(-1);
|
|
table->file->extra(HA_EXTRA_WRITE_CACHE);
|
|
table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);
|
|
bzero((char*) &result_table_list,sizeof(result_table_list));
|
|
result_table_list.db= (char*) "";
|
|
result_table_list.real_name=result_table_list.name=(char*) "union";
|
|
result_table_list.table=table;
|
|
|
|
if (!(union_result=new select_union(table)))
|
|
{
|
|
res= -1;
|
|
goto exit;
|
|
}
|
|
union_result->save_time_stamp=!describe;
|
|
union_result->tmp_table_param=&tmp_table_param;
|
|
for (sl= &lex->select_lex; sl; sl=sl->next)
|
|
{
|
|
lex->select=sl;
|
|
thd->offset_limit=sl->offset_limit;
|
|
thd->select_limit=sl->select_limit+sl->offset_limit;
|
|
if (thd->select_limit < sl->select_limit)
|
|
thd->select_limit= HA_POS_ERROR; // no limit
|
|
if (thd->select_limit == HA_POS_ERROR)
|
|
sl->options&= ~OPTION_FOUND_ROWS;
|
|
|
|
res=mysql_select(thd, (describe && sl->linkage==NOT_A_SELECT) ? first_table : (TABLE_LIST*) sl->table_list.first,
|
|
sl->item_list,
|
|
sl->where,
|
|
(sl->braces) ? (ORDER *)sl->order_list.first : (ORDER *) 0,
|
|
(ORDER*) sl->group_list.first,
|
|
sl->having,
|
|
(ORDER*) NULL,
|
|
sl->options | thd->options | SELECT_NO_UNLOCK | ((describe) ? SELECT_DESCRIBE : 0),
|
|
union_result);
|
|
if (res)
|
|
goto exit;
|
|
}
|
|
if (union_result->flush())
|
|
{
|
|
res= 1; // Error is already sent
|
|
goto exit;
|
|
}
|
|
delete union_result;
|
|
|
|
/* Send result to 'result' */
|
|
lex->select = &lex->select_lex;
|
|
res =-1;
|
|
{
|
|
/* Create a list of fields in the temporary table */
|
|
List_iterator<Item> it(item_list);
|
|
Field **field;
|
|
#if 0
|
|
List<Item_func_match> ftfunc_list;
|
|
ftfunc_list.empty();
|
|
#else
|
|
thd->lex.select_lex.ftfunc_list.empty();
|
|
#endif
|
|
|
|
for (field=table->field ; *field ; field++)
|
|
{
|
|
(void) it++;
|
|
(void) it.replace(new Item_field(*field));
|
|
}
|
|
if (!thd->fatal_error) // Check if EOM
|
|
{
|
|
if (lex_sl)
|
|
{
|
|
thd->offset_limit=lex_sl->offset_limit;
|
|
thd->select_limit=lex_sl->select_limit+lex_sl->offset_limit;
|
|
if (thd->select_limit < lex_sl->select_limit)
|
|
thd->select_limit= HA_POS_ERROR; // no limit
|
|
if (thd->select_limit == HA_POS_ERROR)
|
|
thd->options&= ~OPTION_FOUND_ROWS;
|
|
}
|
|
else
|
|
{
|
|
thd->offset_limit= 0;
|
|
thd->select_limit= thd->default_select_limit;
|
|
}
|
|
if (describe)
|
|
thd->select_limit= HA_POS_ERROR; // no limit
|
|
res=mysql_select(thd,&result_table_list,
|
|
item_list, NULL, (describe) ? 0 : order,
|
|
(ORDER*) NULL, NULL, (ORDER*) NULL,
|
|
thd->options, result);
|
|
if (found_rows_for_union && !res)
|
|
thd->limit_found_rows = (ulonglong)table->file->records;
|
|
}
|
|
}
|
|
|
|
exit:
|
|
free_tmp_table(thd,table);
|
|
DBUG_RETURN(res);
|
|
}
|
|
|
|
|
|
/***************************************************************************
|
|
** store records in temporary table for UNION
|
|
***************************************************************************/
|
|
|
|
select_union::select_union(TABLE *table_par)
|
|
:table(table_par)
|
|
{
|
|
bzero((char*) &info,sizeof(info));
|
|
/*
|
|
We can always use DUP_IGNORE because the temporary table will only
|
|
contain a unique key if we are using not using UNION ALL
|
|
*/
|
|
info.handle_duplicates=DUP_IGNORE;
|
|
}
|
|
|
|
select_union::~select_union()
|
|
{
|
|
}
|
|
|
|
|
|
int select_union::prepare(List<Item> &list)
|
|
{
|
|
if (save_time_stamp && list.elements != table->fields)
|
|
{
|
|
my_message(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT,
|
|
ER(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT),MYF(0));
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
bool select_union::send_data(List<Item> &values)
|
|
{
|
|
if (thd->offset_limit)
|
|
{ // using limit offset,count
|
|
thd->offset_limit--;
|
|
return 0;
|
|
}
|
|
fill_record(table->field,values);
|
|
if ((write_record(table,&info)))
|
|
{
|
|
if (create_myisam_from_heap(table, tmp_table_param, info.last_errno, 0))
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
bool select_union::send_eof()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
bool select_union::flush()
|
|
{
|
|
int error;
|
|
if ((error=table->file->extra(HA_EXTRA_NO_CACHE)))
|
|
{
|
|
table->file->print_error(error,MYF(0));
|
|
::send_error(&thd->net);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|