2003-04-08 02:54:02 +02:00
|
|
|
/* Copyright (C) 2000-2003 MySQL AB
|
2001-08-02 05:29:50 +02:00
|
|
|
|
|
|
|
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"
|
|
|
|
|
2004-10-20 03:04:37 +02:00
|
|
|
bool mysql_union(THD *thd, LEX *lex, select_result *result,
|
2005-01-03 20:04:33 +01:00
|
|
|
SELECT_LEX_UNIT *unit, ulong setup_tables_done_option)
|
2002-09-03 08:50:36 +02:00
|
|
|
{
|
|
|
|
DBUG_ENTER("mysql_union");
|
2004-10-20 03:04:37 +02:00
|
|
|
bool res;
|
2005-01-03 20:04:33 +01:00
|
|
|
if (!(res= unit->prepare(thd, result, SELECT_NO_UNLOCK |
|
2005-03-31 09:39:48 +02:00
|
|
|
setup_tables_done_option, "")))
|
2002-09-03 08:50:36 +02:00
|
|
|
res= unit->exec();
|
2004-10-20 03:04:37 +02:00
|
|
|
if (!res && thd->cursor && thd->cursor->is_open())
|
Port of cursors to be pushed into 5.0 tree:
- client side part is simple and may be considered stable
- server side part now just joggles with THD state to save execution
state and has no additional locking wisdom.
Lot's of it are to be rewritten.
include/mysql.h:
Cursor patch to push into the main tree, client library part (considered
stable):
- new statement attribute STMT_ATTR_CURSOR_TYPE
- MYSQL_STMT::flags to store statement cursor type
- MYSQL_STMT::server_status to store server status (i. e. if the server
was able to open a cursor for this query).
include/mysql_com.h:
Cursor patch to push into the main tree, client library part (considered
stable):
- new COMmand, COM_FETCH, to fetch K rows from read-only cursor.
By design should support scrollable cursors as well.
- a few new server statuses:
SERVER_STATUS_CURSOR_EXISTS is sent by server in reply to COM_EXECUTE,
when cursor was successfully opened for this query
SERVER_STATUS_LAST_ROW_SENT is sent along with the last row to prevent one
more round trip just for finding out that all rows were fetched from
this cursor (this is server mem savier also).
- and finally, all possible values of STMT_ATTR_CURSOR_TYPE,
while now we support only CURSORT_TYPE_NO_CURSOR and
CURSOR_TYPE_READ_ONLY
libmysql/libmysql.c:
Cursor patch to push into the main tree, client library part (considered
stable):
- simple additions to mysql_stmt_fetch implementation to read data
from an opened cursor: we can read up to iteration count rows per
one request; read rows are buffered in the same way as rows of
mysql_stmt_store_result.
- now send stmt->flags to server to let him now if we wish to have
a cursor for this statement.
- support for setting/getting statement cursor type.
libmysqld/examples/Makefile.am:
Testing cursors was originally implemented in C++. Now when these tests
go into client_test, it's time to convert it to C++ as well.
libmysqld/lib_sql.cc:
- cleanup: send_fields flags are now named.
sql/ha_innodb.cc:
- cleanup: send_fields flags are now named.
sql/mysql_priv.h:
- cursors support: declaration for server-side handler of COM_FETCH
sql/protocol.cc:
- cleanup: send_fields flags are now named.
- we can't anymore assert that field_types[field_pos] is sensible:
if we have COM_EXCUTE(stmt1), COM_EXECUTE(stmt2), COM_FETCH(stmt1)
field_types[field_pos] will point to fields of stmt2.
sql/protocol.h:
- cleanup: send_fields flag_s_ are now named.
sql/protocol_cursor.cc:
- cleanup: send_fields flags are now named.
sql/repl_failsafe.cc:
- cleanup: send_fields flags are now named.
sql/slave.cc:
- cleanup: send_fields flags are now named.
sql/sp.cc:
- cleanup: send_fields flags are now named.
sql/sp_head.cc:
- cleanup: send_fields flags are now named.
sql/sql_acl.cc:
- cleanup: send_fields flags are now named.
sql/sql_class.cc:
- cleanup: send_fields flags are now named.
sql/sql_class.h:
- cleanup: send_fields flags are now named.
sql/sql_error.cc:
- cleanup: send_fields flags are now named.
sql/sql_handler.cc:
- cleanup: send_fields flags are now named.
sql/sql_help.cc:
- cleanup: send_fields flags are now named.
sql/sql_parse.cc:
Server side support for cursors:
- handle COM_FETCH
- enforce assumption that whenever we free thd->free_list,
we reset it to zero. This way it's much easier to handle free_list
in prepared statements implementation.
sql/sql_prepare.cc:
Server side support for cursors:
- implementation of mysql_stmt_fetch (fetch some rows from open cursor).
- management of cursors memory is quite tricky now.
- execute_stmt can't be reused anymore in mysql_stmt_execute and
mysql_sql_stmt_execute
sql/sql_repl.cc:
- cleanup: send_fields flags are now named.
sql/sql_select.cc:
Server side support for cursors:
- implementation of Cursor::open, Cursor::fetch (buggy when it comes to
non-equi joins), cursor cleanups.
- -4 -3 -0 constants indicating return value of sub_select and end_send are
to be renamed to something more readable:
it turned out to be not so simple, so it should come with the other patch.
sql/sql_select.h:
Server side support for cursors:
- declaration of Cursor class.
- JOIN::fetch_limit contains runtime value of rows fetched via cursor.
sql/sql_show.cc:
- cleanup: send_fields flags are now named.
sql/sql_table.cc:
- cleanup: send_fields flags are now named.
sql/sql_union.cc:
- if there was a cursor, don't cleanup unit: we'll need it to fetch
the rest of the rows.
tests/Makefile.am:
Now client_test is in C++.
tests/client_test.cc:
A few elementary tests for cursors.
BitKeeper/etc/ignore:
Added libmysqld/examples/client_test.cc to the ignore list
2004-08-03 12:32:21 +02:00
|
|
|
{
|
|
|
|
thd->cursor->set_unit(unit);
|
|
|
|
}
|
|
|
|
else
|
2004-10-20 03:04:37 +02:00
|
|
|
res|= unit->cleanup();
|
|
|
|
DBUG_RETURN(res);
|
2002-09-03 08:50:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***************************************************************************
|
|
|
|
** store records in temporary table for UNION
|
|
|
|
***************************************************************************/
|
|
|
|
|
|
|
|
select_union::select_union(TABLE *table_par)
|
2004-05-06 19:40:21 +02:00
|
|
|
:table(table_par)
|
2002-09-03 08:50:36 +02:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
select_union::~select_union()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int select_union::prepare(List<Item> &list, SELECT_LEX_UNIT *u)
|
|
|
|
{
|
|
|
|
unit= u;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-04-08 02:54:02 +02:00
|
|
|
|
2002-09-03 08:50:36 +02:00
|
|
|
bool select_union::send_data(List<Item> &values)
|
|
|
|
{
|
2005-02-24 22:33:42 +01:00
|
|
|
int error= 0;
|
2002-09-03 08:50:36 +02:00
|
|
|
if (unit->offset_limit_cnt)
|
|
|
|
{ // using limit offset,count
|
|
|
|
unit->offset_limit_cnt--;
|
|
|
|
return 0;
|
|
|
|
}
|
2004-11-12 13:34:00 +01:00
|
|
|
fill_record(thd, table->field, values, 1);
|
2005-02-24 22:33:42 +01:00
|
|
|
if (thd->net.report_error)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if ((error= table->file->write_row(table->record[0])))
|
2002-09-03 08:50:36 +02:00
|
|
|
{
|
2005-02-24 22:33:42 +01:00
|
|
|
/* create_myisam_from_heap will generate error if needed */
|
|
|
|
if (error != HA_ERR_FOUND_DUPP_KEY && error != HA_ERR_FOUND_DUPP_UNIQUE &&
|
|
|
|
create_myisam_from_heap(thd, table, &tmp_table_param, error, 1))
|
2002-09-03 08:50:36 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-04-08 02:54:02 +02:00
|
|
|
|
2002-09-03 08:50:36 +02:00
|
|
|
bool select_union::send_eof()
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2001-08-02 05:29:50 +02:00
|
|
|
|
2003-04-08 02:54:02 +02:00
|
|
|
|
2002-09-03 08:50:36 +02:00
|
|
|
bool select_union::flush()
|
2001-08-02 05:29:50 +02:00
|
|
|
{
|
2002-09-03 08:50:36 +02:00
|
|
|
int error;
|
|
|
|
if ((error=table->file->extra(HA_EXTRA_NO_CACHE)))
|
|
|
|
{
|
2004-10-20 03:04:37 +02:00
|
|
|
table->file->print_error(error, MYF(0));
|
2002-09-03 08:50:36 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-04-08 02:54:02 +02:00
|
|
|
|
2004-05-06 23:08:21 +02:00
|
|
|
/*
|
|
|
|
initialization procedures before fake_select_lex preparation()
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
st_select_lex_unit::init_prepare_fake_select_lex()
|
|
|
|
thd - thread handler
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
options of SELECT
|
|
|
|
*/
|
|
|
|
|
2005-05-30 18:54:37 +02:00
|
|
|
void
|
2004-05-06 23:08:21 +02:00
|
|
|
st_select_lex_unit::init_prepare_fake_select_lex(THD *thd)
|
|
|
|
{
|
|
|
|
thd->lex->current_select= fake_select_lex;
|
|
|
|
fake_select_lex->ftfunc_list_alloc.empty();
|
|
|
|
fake_select_lex->ftfunc_list= &fake_select_lex->ftfunc_list_alloc;
|
|
|
|
fake_select_lex->table_list.link_in_list((byte *)&result_table_list,
|
|
|
|
(byte **)
|
2004-07-16 00:15:55 +02:00
|
|
|
&result_table_list.next_local);
|
2005-07-01 06:05:42 +02:00
|
|
|
for (ORDER *order= (ORDER *)global_parameters->order_list.first;
|
|
|
|
order;
|
|
|
|
order=order->next)
|
|
|
|
{
|
|
|
|
(*order->item)->walk(&Item::change_context_processor,
|
|
|
|
(byte *) &fake_select_lex->context);
|
|
|
|
}
|
2004-05-06 23:08:21 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-10-20 03:04:37 +02:00
|
|
|
bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
|
2005-03-31 09:39:48 +02:00
|
|
|
ulong additional_options,
|
|
|
|
const char *tmp_table_alias)
|
2002-09-03 08:50:36 +02:00
|
|
|
{
|
2003-12-19 18:52:13 +01:00
|
|
|
SELECT_LEX *lex_select_save= thd_arg->lex->current_select;
|
2003-11-23 01:01:15 +01:00
|
|
|
SELECT_LEX *sl, *first_select;
|
|
|
|
select_result *tmp_result;
|
2004-10-22 20:51:16 +02:00
|
|
|
bool is_union;
|
2005-02-04 13:31:36 +01:00
|
|
|
TABLE *empty_table= 0;
|
2002-10-13 13:25:16 +02:00
|
|
|
DBUG_ENTER("st_select_lex_unit::prepare");
|
|
|
|
|
2004-05-06 19:40:21 +02:00
|
|
|
describe= test(additional_options & SELECT_DESCRIBE);
|
|
|
|
|
2003-10-27 00:01:27 +01:00
|
|
|
/*
|
|
|
|
result object should be reassigned even if preparing already done for
|
|
|
|
max/min subquery (ALL/ANY optimization)
|
|
|
|
*/
|
|
|
|
result= sel_result;
|
|
|
|
|
2002-10-13 13:25:16 +02:00
|
|
|
if (prepared)
|
2004-05-06 19:40:21 +02:00
|
|
|
{
|
|
|
|
if (describe)
|
|
|
|
{
|
|
|
|
/* fast reinit for EXPLAIN */
|
|
|
|
for (sl= first_select_in_union(); sl; sl= sl->next_select())
|
|
|
|
{
|
|
|
|
sl->join->result= result;
|
|
|
|
select_limit_cnt= HA_POS_ERROR;
|
|
|
|
offset_limit_cnt= 0;
|
|
|
|
if (!sl->join->procedure &&
|
|
|
|
result->prepare(sl->join->fields_list, this))
|
|
|
|
{
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2004-05-06 19:40:21 +02:00
|
|
|
}
|
|
|
|
sl->join->select_options|= SELECT_DESCRIBE;
|
|
|
|
sl->join->reinit();
|
|
|
|
}
|
|
|
|
}
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(FALSE);
|
2004-05-06 19:40:21 +02:00
|
|
|
}
|
2002-10-13 13:25:16 +02:00
|
|
|
prepared= 1;
|
2004-10-20 03:04:37 +02:00
|
|
|
res= FALSE;
|
2003-04-21 20:03:32 +02:00
|
|
|
|
2003-12-19 18:52:13 +01:00
|
|
|
thd_arg->lex->current_select= sl= first_select= first_select_in_union();
|
2003-11-23 01:01:15 +01:00
|
|
|
found_rows_for_union= first_select->options & OPTION_FOUND_ROWS;
|
2004-10-22 20:51:16 +02:00
|
|
|
is_union= test(first_select->next_select());
|
2003-11-23 01:01:15 +01:00
|
|
|
|
2002-05-08 22:14:40 +02:00
|
|
|
/* Global option */
|
2003-11-23 01:01:15 +01:00
|
|
|
|
2004-10-22 20:51:16 +02:00
|
|
|
if (is_union)
|
2001-08-02 05:29:50 +02:00
|
|
|
{
|
2003-11-23 01:01:15 +01:00
|
|
|
if (!(tmp_result= union_result= new select_union(0)))
|
|
|
|
goto err;
|
2003-11-28 11:18:13 +01:00
|
|
|
union_result->tmp_table_param.init();
|
2004-05-06 19:40:21 +02:00
|
|
|
if (describe)
|
|
|
|
tmp_result= sel_result;
|
2003-01-29 18:42:39 +01:00
|
|
|
}
|
|
|
|
else
|
2003-11-23 01:01:15 +01:00
|
|
|
tmp_result= sel_result;
|
2001-09-17 14:40:03 +02:00
|
|
|
|
2005-07-01 06:05:42 +02:00
|
|
|
sl->context.resolve_in_select_list= TRUE;
|
|
|
|
|
2003-08-30 16:13:10 +02:00
|
|
|
for (;sl; sl= sl->next_select())
|
2001-08-02 05:29:50 +02:00
|
|
|
{
|
2004-10-22 20:51:16 +02:00
|
|
|
bool can_skip_order_by;
|
2004-01-16 19:05:08 +01:00
|
|
|
sl->options|= SELECT_NO_UNLOCK;
|
2003-11-28 11:18:13 +01:00
|
|
|
JOIN *join= new JOIN(thd_arg, sl->item_list,
|
2003-12-10 21:46:14 +01:00
|
|
|
sl->options | thd_arg->options | additional_options,
|
2003-11-23 01:01:15 +01:00
|
|
|
tmp_result);
|
2005-01-03 20:04:33 +01:00
|
|
|
/*
|
|
|
|
setup_tables_done_option should be set only for very first SELECT,
|
|
|
|
because it protect from secont setup_tables call for select-like non
|
|
|
|
select commands (DELETE/INSERT/...) and they use only very first
|
|
|
|
SELECT (for union it can be only INSERT ... SELECT).
|
|
|
|
*/
|
|
|
|
additional_options&= ~OPTION_SETUP_TABLES_DONE;
|
2004-03-25 21:11:22 +01:00
|
|
|
if (!join)
|
|
|
|
goto err;
|
|
|
|
|
2003-12-19 18:52:13 +01:00
|
|
|
thd_arg->lex->current_select= sl;
|
2004-10-22 20:51:16 +02:00
|
|
|
|
2005-05-30 19:49:59 +02:00
|
|
|
can_skip_order_by= is_union && !(sl->braces && sl->explicit_limit);
|
|
|
|
|
2003-05-14 20:51:33 +02:00
|
|
|
res= join->prepare(&sl->ref_pointer_array,
|
|
|
|
(TABLE_LIST*) sl->table_list.first, sl->with_wild,
|
|
|
|
sl->where,
|
2004-10-29 18:26:52 +02:00
|
|
|
(can_skip_order_by ? 0 : sl->order_list.elements) +
|
2004-10-22 20:51:16 +02:00
|
|
|
sl->group_list.elements,
|
|
|
|
can_skip_order_by ?
|
|
|
|
(ORDER*) 0 : (ORDER *)sl->order_list.first,
|
2003-05-14 20:51:33 +02:00
|
|
|
(ORDER*) sl->group_list.first,
|
|
|
|
sl->having,
|
2004-10-26 18:30:01 +02:00
|
|
|
(is_union ? (ORDER*) 0 :
|
|
|
|
(ORDER*) thd_arg->lex->proc_list.first),
|
2003-11-23 01:01:15 +01:00
|
|
|
sl, this);
|
2004-10-26 18:30:01 +02:00
|
|
|
/* There are no * in the statement anymore (for PS) */
|
|
|
|
sl->with_wild= 0;
|
|
|
|
last_procedure= join->procedure;
|
2004-10-29 18:26:52 +02:00
|
|
|
|
2004-10-20 03:04:37 +02:00
|
|
|
if ((res= (res || thd_arg->is_fatal_error)))
|
2003-05-14 20:51:33 +02:00
|
|
|
goto err;
|
2003-11-23 01:01:15 +01:00
|
|
|
if (sl == first_select)
|
|
|
|
{
|
2005-02-04 13:31:36 +01:00
|
|
|
/*
|
|
|
|
We need to create an empty table object. It is used
|
|
|
|
to create tmp_table fields in Item_type_holder.
|
|
|
|
The main reason of this is that we can't create
|
|
|
|
field object without table.
|
|
|
|
*/
|
|
|
|
DBUG_ASSERT(!empty_table);
|
|
|
|
empty_table= (TABLE*) thd->calloc(sizeof(TABLE));
|
2003-11-23 01:01:15 +01:00
|
|
|
types.empty();
|
|
|
|
List_iterator_fast<Item> it(sl->item_list);
|
2003-11-28 11:18:13 +01:00
|
|
|
Item *item_tmp;
|
|
|
|
while ((item_tmp= it++))
|
2003-11-23 01:01:15 +01:00
|
|
|
{
|
2004-03-25 21:11:22 +01:00
|
|
|
/* Error's in 'new' will be detected after loop */
|
2005-03-23 07:36:48 +01:00
|
|
|
types.push_back(new Item_type_holder(thd_arg, item_tmp));
|
2003-11-23 01:01:15 +01:00
|
|
|
}
|
|
|
|
|
2003-11-28 11:18:13 +01:00
|
|
|
if (thd_arg->is_fatal_error)
|
2003-11-23 01:01:15 +01:00
|
|
|
goto err; // out of memory
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (types.elements != sl->item_list.elements)
|
|
|
|
{
|
|
|
|
my_message(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT,
|
|
|
|
ER(ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT),MYF(0));
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
List_iterator_fast<Item> it(sl->item_list);
|
|
|
|
List_iterator_fast<Item> tp(types);
|
2003-11-28 11:18:13 +01:00
|
|
|
Item *type, *item_tmp;
|
|
|
|
while ((type= tp++, item_tmp= it++))
|
2003-11-23 01:01:15 +01:00
|
|
|
{
|
2005-03-23 07:36:48 +01:00
|
|
|
if (((Item_type_holder*)type)->join_types(thd_arg, item_tmp))
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2003-11-23 01:01:15 +01:00
|
|
|
}
|
|
|
|
}
|
2001-08-02 05:29:50 +02:00
|
|
|
}
|
2003-03-06 16:02:10 +01:00
|
|
|
|
2004-10-22 20:51:16 +02:00
|
|
|
if (is_union)
|
2003-01-29 18:42:39 +01:00
|
|
|
{
|
2004-10-18 14:56:25 +02:00
|
|
|
/*
|
2004-10-19 08:45:33 +02:00
|
|
|
Check that it was possible to aggregate
|
|
|
|
all collations together for UNION.
|
2004-10-18 14:56:25 +02:00
|
|
|
*/
|
|
|
|
List_iterator_fast<Item> tp(types);
|
2005-06-15 19:58:35 +02:00
|
|
|
Query_arena *arena= thd->current_arena;
|
2004-10-18 14:56:25 +02:00
|
|
|
Item *type;
|
2004-10-29 18:26:52 +02:00
|
|
|
|
2004-10-18 14:56:25 +02:00
|
|
|
while ((type= tp++))
|
|
|
|
{
|
|
|
|
if (type->result_type() == STRING_RESULT &&
|
|
|
|
type->collation.derivation == DERIVATION_NONE)
|
|
|
|
{
|
|
|
|
my_error(ER_CANT_AGGREGATE_NCOLLATIONS, MYF(0), "UNION");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-11-28 11:18:13 +01:00
|
|
|
union_result->tmp_table_param.field_count= types.elements;
|
|
|
|
if (!(table= create_tmp_table(thd_arg,
|
|
|
|
&union_result->tmp_table_param, types,
|
2004-05-05 07:59:17 +02:00
|
|
|
(ORDER*) 0, (bool) union_distinct, 1,
|
2003-11-23 01:01:15 +01:00
|
|
|
(first_select_in_union()->options |
|
2003-11-28 11:18:13 +01:00
|
|
|
thd_arg->options |
|
2003-11-23 01:01:15 +01:00
|
|
|
TMP_TABLE_ALL_COLUMNS),
|
2005-03-23 07:36:48 +01:00
|
|
|
HA_POS_ERROR, (char *) tmp_table_alias)))
|
2003-11-23 01:01:15 +01:00
|
|
|
goto err;
|
|
|
|
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*) "";
|
2005-01-06 12:00:13 +01:00
|
|
|
result_table_list.table_name= result_table_list.alias= (char*) "union";
|
2003-11-23 01:01:15 +01:00
|
|
|
result_table_list.table= table;
|
|
|
|
union_result->set_table(table);
|
2003-01-29 18:42:39 +01:00
|
|
|
|
2003-12-19 18:52:13 +01:00
|
|
|
thd_arg->lex->current_select= lex_select_save;
|
2004-05-06 23:32:44 +02:00
|
|
|
if (!item_list.elements)
|
2003-01-29 18:42:39 +01:00
|
|
|
{
|
2004-11-09 02:58:44 +01:00
|
|
|
Field **field;
|
2005-06-15 19:58:35 +02:00
|
|
|
Query_arena *tmp_arena,backup;
|
2004-11-08 00:13:54 +01:00
|
|
|
tmp_arena= thd->change_arena_if_needed(&backup);
|
2004-09-09 05:59:26 +02:00
|
|
|
|
2003-11-23 01:01:15 +01:00
|
|
|
for (field= table->field; *field; field++)
|
|
|
|
{
|
2004-03-20 12:36:26 +01:00
|
|
|
Item_field *item= new Item_field(*field);
|
|
|
|
if (!item || item_list.push_back(item))
|
2004-03-23 13:26:54 +01:00
|
|
|
{
|
2004-11-08 00:13:54 +01:00
|
|
|
if (tmp_arena)
|
|
|
|
thd->restore_backup_item_arena(tmp_arena, &backup);
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2004-03-23 13:26:54 +01:00
|
|
|
}
|
2003-11-23 01:01:15 +01:00
|
|
|
}
|
2004-11-08 00:13:54 +01:00
|
|
|
if (tmp_arena)
|
|
|
|
thd->restore_backup_item_arena(tmp_arena, &backup);
|
2005-06-02 22:02:47 +02:00
|
|
|
if (arena->is_stmt_prepare_or_first_sp_execute())
|
2004-05-06 23:08:21 +02:00
|
|
|
{
|
|
|
|
/* prepare fake select to initialize it correctly */
|
2005-05-30 18:54:37 +02:00
|
|
|
init_prepare_fake_select_lex(thd);
|
2004-05-20 01:02:49 +02:00
|
|
|
/*
|
2005-03-03 11:29:37 +01:00
|
|
|
Should be done only once (the only item_list per statement).
|
2004-05-20 01:02:49 +02:00
|
|
|
*/
|
|
|
|
DBUG_ASSERT(fake_select_lex->join == 0);
|
2004-05-06 23:08:21 +02:00
|
|
|
if (!(fake_select_lex->join= new JOIN(thd, item_list, thd->options,
|
|
|
|
result)))
|
|
|
|
{
|
|
|
|
fake_select_lex->table_list.empty();
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2004-05-06 23:08:21 +02:00
|
|
|
}
|
|
|
|
fake_select_lex->item_list= item_list;
|
|
|
|
|
|
|
|
thd_arg->lex->current_select= fake_select_lex;
|
|
|
|
res= fake_select_lex->join->
|
|
|
|
prepare(&fake_select_lex->ref_pointer_array,
|
|
|
|
(TABLE_LIST*) fake_select_lex->table_list.first,
|
|
|
|
0, 0,
|
|
|
|
fake_select_lex->order_list.elements,
|
|
|
|
(ORDER*) fake_select_lex->order_list.first,
|
2004-10-26 18:30:01 +02:00
|
|
|
(ORDER*) NULL, NULL,
|
|
|
|
(ORDER*) NULL,
|
2004-05-06 23:08:21 +02:00
|
|
|
fake_select_lex, this);
|
|
|
|
fake_select_lex->table_list.empty();
|
|
|
|
}
|
2003-01-29 18:42:39 +01:00
|
|
|
}
|
2004-10-29 18:26:52 +02:00
|
|
|
else if (!arena->is_conventional())
|
2004-10-22 12:47:35 +02:00
|
|
|
{
|
|
|
|
/*
|
2004-10-29 18:26:52 +02:00
|
|
|
We're in execution of a prepared statement or stored procedure:
|
|
|
|
reset field items to point at fields from the created temporary table.
|
2004-10-22 12:47:35 +02:00
|
|
|
*/
|
|
|
|
List_iterator_fast<Item> it(item_list);
|
|
|
|
for (Field **field= table->field; *field; field++)
|
|
|
|
{
|
|
|
|
Item_field *item_field= (Item_field*) it++;
|
2005-02-25 15:53:22 +01:00
|
|
|
DBUG_ASSERT(item_field != 0);
|
2004-10-22 18:21:55 +02:00
|
|
|
item_field->reset_field(*field);
|
2004-10-22 12:47:35 +02:00
|
|
|
}
|
|
|
|
}
|
2003-01-29 18:42:39 +01:00
|
|
|
}
|
2003-11-23 01:01:15 +01:00
|
|
|
|
2003-12-19 18:52:13 +01:00
|
|
|
thd_arg->lex->current_select= lex_select_save;
|
2003-01-29 18:42:39 +01:00
|
|
|
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(res || thd_arg->is_fatal_error);
|
2003-11-23 01:01:15 +01:00
|
|
|
|
2002-09-26 22:08:22 +02:00
|
|
|
err:
|
2003-12-19 18:52:13 +01:00
|
|
|
thd_arg->lex->current_select= lex_select_save;
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2002-09-03 08:50:36 +02:00
|
|
|
}
|
|
|
|
|
2003-03-18 10:17:48 +01:00
|
|
|
|
2004-10-20 03:04:37 +02:00
|
|
|
bool st_select_lex_unit::exec()
|
2002-09-03 08:50:36 +02:00
|
|
|
{
|
2003-12-19 18:52:13 +01:00
|
|
|
SELECT_LEX *lex_select_save= thd->lex->current_select;
|
2003-04-21 20:03:32 +02:00
|
|
|
SELECT_LEX *select_cursor=first_select_in_union();
|
2003-08-29 12:44:35 +02:00
|
|
|
ulonglong add_rows=0;
|
2004-10-06 18:14:33 +02:00
|
|
|
ha_rows examined_rows= 0;
|
2003-04-08 02:54:02 +02:00
|
|
|
DBUG_ENTER("st_select_lex_unit::exec");
|
|
|
|
|
2004-05-06 19:40:21 +02:00
|
|
|
if (executed && !uncacheable && !describe)
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(FALSE);
|
2002-10-27 20:29:40 +01:00
|
|
|
executed= 1;
|
|
|
|
|
2004-05-06 19:40:21 +02:00
|
|
|
if (uncacheable || !item || !item->assigned() || describe)
|
2002-09-03 08:50:36 +02:00
|
|
|
{
|
2004-11-18 17:10:07 +01:00
|
|
|
if (item)
|
|
|
|
item->reset_value_registration();
|
2004-05-21 09:31:28 +02:00
|
|
|
if (optimized && item)
|
2002-11-28 18:29:26 +01:00
|
|
|
{
|
2004-05-21 09:31:28 +02:00
|
|
|
if (item->assigned())
|
|
|
|
{
|
|
|
|
item->assigned(0); // We will reinit & rexecute unit
|
|
|
|
item->reset();
|
|
|
|
table->file->delete_all_rows();
|
|
|
|
}
|
|
|
|
/* re-enabling indexes for next subselect iteration */
|
|
|
|
if (union_distinct && table->file->enable_indexes(HA_KEY_SWITCH_ALL))
|
2005-03-23 20:38:42 +01:00
|
|
|
DBUG_ASSERT(0);
|
2002-11-28 18:29:26 +01:00
|
|
|
}
|
2003-03-06 16:02:10 +01:00
|
|
|
for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select())
|
2002-09-03 08:50:36 +02:00
|
|
|
{
|
2003-08-27 14:24:52 +02:00
|
|
|
ha_rows records_at_start= 0;
|
2003-12-19 18:52:13 +01:00
|
|
|
thd->lex->current_select= sl;
|
2003-05-14 20:51:33 +02:00
|
|
|
|
2003-02-13 16:56:01 +01:00
|
|
|
if (optimized)
|
2002-10-26 19:18:37 +02:00
|
|
|
res= sl->join->reinit();
|
2003-02-13 16:56:01 +01:00
|
|
|
else
|
|
|
|
{
|
2005-05-30 18:54:37 +02:00
|
|
|
set_limit(sl);
|
|
|
|
if (sl == global_parameters || describe)
|
2003-09-14 21:12:55 +02:00
|
|
|
{
|
|
|
|
offset_limit_cnt= 0;
|
|
|
|
/*
|
|
|
|
We can't use LIMIT at this stage if we are using ORDER BY for the
|
|
|
|
whole query
|
|
|
|
*/
|
2004-05-06 19:40:21 +02:00
|
|
|
if (sl->order_list.first || describe)
|
2003-09-14 21:12:55 +02:00
|
|
|
select_limit_cnt= HA_POS_ERROR;
|
2005-05-30 18:54:37 +02:00
|
|
|
}
|
2003-08-29 12:44:35 +02:00
|
|
|
|
2005-03-02 17:00:48 +01:00
|
|
|
/*
|
|
|
|
When using braces, SQL_CALC_FOUND_ROWS affects the whole query:
|
|
|
|
we don't calculate found_rows() per union part.
|
|
|
|
Otherwise, SQL_CALC_FOUND_ROWS should be done on all sub parts.
|
|
|
|
*/
|
|
|
|
sl->join->select_options=
|
|
|
|
(select_limit_cnt == HA_POS_ERROR || sl->braces) ?
|
|
|
|
sl->options & ~OPTION_FOUND_ROWS : sl->options | found_rows_for_union;
|
2003-02-13 16:56:01 +01:00
|
|
|
res= sl->join->optimize();
|
|
|
|
}
|
2002-10-26 19:18:37 +02:00
|
|
|
if (!res)
|
|
|
|
{
|
2003-08-23 20:21:02 +02:00
|
|
|
records_at_start= table->file->records;
|
2002-10-26 19:18:37 +02:00
|
|
|
sl->join->exec();
|
2004-03-23 14:43:24 +01:00
|
|
|
if (sl == union_distinct)
|
2004-05-15 15:13:08 +02:00
|
|
|
{
|
|
|
|
if (table->file->disable_indexes(HA_KEY_SWITCH_ALL))
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2004-05-15 15:13:08 +02:00
|
|
|
table->no_keyread=1;
|
|
|
|
}
|
2002-10-26 19:18:37 +02:00
|
|
|
res= sl->join->error;
|
Patch two (the final one) for Bug#7306 "the server side preparedStatement
error for LIMIT placeholder".
The patch adds grammar support for LIMIT ?, ? and changes the
type of ST_SELECT_LEX::select_limit,offset_limit from ha_rows to Item*,
so that it can point to Item_param.
mysql-test/include/ps_modify.inc:
Fix existing tests: now LIMIT can contain placeholders.
mysql-test/include/ps_query.inc:
Fix existing tests: now LIMIT can contain placeholders.
mysql-test/r/ps.result:
Add basic test coverage for LIMIT ?, ? and fix test results.
mysql-test/r/ps_2myisam.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_3innodb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_4heap.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_5merge.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_6bdb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/r/ps_7ndb.result:
Fix test results: now LIMIT can contain placeholders.
mysql-test/t/ps.test:
Add basic test coverage for LIMIT ?, ?.
sql/item.h:
Add a short-cut for (ulonglong) val_int() to Item.
Add a constructor to Item_int() that accepts ulonglong.
Simplify Item_uint constructor by using the c-tor above.
sql/item_subselect.cc:
Now select_limit has type Item *.
We can safely create an Item in Item_exists_subselect::fix_length_and_dec():
it will be allocated in runtime memory root and freed in the end of
execution.
sql/sp_head.cc:
Add a special initalization state for stored procedures to
be able to easily distinguish the first execution of a stored procedure
from prepared statement prepare.
sql/sql_class.h:
Introduce new state 'INITIALIZED_FOR_SP' to be able to easily distinguish
the first execution of a stored procedure from prepared statement prepare.
sql/sql_derived.cc:
- use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
evreryplace. Add a warning about use of set_limit in
mysql_derived_filling.
sql/sql_error.cc:
- use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
evreryplace.
- this change is also aware of bug#11095 "show warnings limit 0 returns
all rows instead of zero rows", so the one who merges the bugfix from
4.1 can use local version of sql_error.cc.
sql/sql_handler.cc:
- use unit->set_limit() to initalize
unit->select_limit_cnt,offset_limit_cnt everyplace.
sql/sql_lex.cc:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_lex.h:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_parse.cc:
- use unit->set_limit() to initalize
unit->select_limit_cnt,offset_limit_cnt everyplace.
- we can create an Item_int to set global limit of a statement:
it will be created in the runtime mem root and freed in the end of
execution.
sql/sql_repl.cc:
Use unit->set_limit to initialize limits.
sql/sql_select.cc:
- select_limit is now Item* so the proper way to check for default value
is to compare it with NULL.
sql/sql_union.cc:
Evaluate offset_limit_cnt using the new type of ST_SELECT_LEX::offset_limit
sql/sql_view.cc:
Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
sql/sql_yacc.yy:
Add grammar support for LIMIT ?, ? clause.
2005-06-07 12:11:36 +02:00
|
|
|
offset_limit_cnt= sl->offset_limit ? sl->offset_limit->val_uint() : 0;
|
2005-01-18 22:13:29 +01:00
|
|
|
if (!res)
|
2003-02-13 16:56:01 +01:00
|
|
|
{
|
2005-01-18 22:13:29 +01:00
|
|
|
examined_rows+= thd->examined_row_count;
|
|
|
|
if (union_result->flush())
|
|
|
|
{
|
|
|
|
thd->lex->current_select= lex_select_save;
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
2003-02-13 16:56:01 +01:00
|
|
|
}
|
2002-10-26 19:18:37 +02:00
|
|
|
}
|
2002-09-03 08:50:36 +02:00
|
|
|
if (res)
|
2002-09-26 22:08:22 +02:00
|
|
|
{
|
2003-12-19 18:52:13 +01:00
|
|
|
thd->lex->current_select= lex_select_save;
|
2002-09-03 08:50:36 +02:00
|
|
|
DBUG_RETURN(res);
|
2002-09-26 22:08:22 +02:00
|
|
|
}
|
2003-08-29 12:44:35 +02:00
|
|
|
/* Needed for the following test and for records_at_start in next loop */
|
|
|
|
table->file->info(HA_STATUS_VARIABLE);
|
2005-03-02 17:00:48 +01:00
|
|
|
if (found_rows_for_union && !sl->braces &&
|
|
|
|
select_limit_cnt != HA_POS_ERROR)
|
2003-08-23 20:21:02 +02:00
|
|
|
{
|
|
|
|
/*
|
2003-08-29 12:44:35 +02:00
|
|
|
This is a union without braces. Remember the number of rows that
|
|
|
|
could also have been part of the result set.
|
2003-08-23 20:21:02 +02:00
|
|
|
We get this from the difference of between total number of possible
|
|
|
|
rows and actual rows added to the temporary table.
|
|
|
|
*/
|
2003-09-13 18:56:58 +02:00
|
|
|
add_rows+= (ulonglong) (thd->limit_found_rows - (ulonglong)
|
2003-08-30 17:21:24 +02:00
|
|
|
((table->file->records - records_at_start)));
|
2003-08-23 20:21:02 +02:00
|
|
|
}
|
2002-09-03 08:50:36 +02:00
|
|
|
}
|
2001-08-02 05:29:50 +02:00
|
|
|
}
|
2003-02-13 16:56:01 +01:00
|
|
|
optimized= 1;
|
2001-08-14 19:33:49 +02:00
|
|
|
|
|
|
|
/* Send result to 'result' */
|
2004-10-20 03:04:37 +02:00
|
|
|
res= TRUE;
|
2001-08-02 05:29:50 +02:00
|
|
|
{
|
2002-09-03 08:50:36 +02:00
|
|
|
List<Item_func_match> empty_list;
|
|
|
|
empty_list.empty();
|
2001-08-02 05:29:50 +02:00
|
|
|
|
2003-08-29 12:44:35 +02:00
|
|
|
if (!thd->is_fatal_error) // Check if EOM
|
2001-10-19 16:43:30 +02:00
|
|
|
{
|
2005-05-30 18:54:37 +02:00
|
|
|
set_limit(global_parameters);
|
|
|
|
init_prepare_fake_select_lex(thd);
|
2003-07-05 16:21:39 +02:00
|
|
|
JOIN *join= fake_select_lex->join;
|
|
|
|
if (!join)
|
|
|
|
{
|
|
|
|
/*
|
2004-05-05 20:24:21 +02:00
|
|
|
allocate JOIN for fake select only once (prevent
|
2003-07-05 16:21:39 +02:00
|
|
|
mysql_select automatic allocation)
|
|
|
|
*/
|
2004-04-07 19:07:44 +02:00
|
|
|
if (!(fake_select_lex->join= new JOIN(thd, item_list,
|
|
|
|
fake_select_lex->options, result)))
|
2004-05-03 12:58:01 +02:00
|
|
|
{
|
|
|
|
fake_select_lex->table_list.empty();
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2004-05-03 12:58:01 +02:00
|
|
|
}
|
2004-03-25 21:11:22 +01:00
|
|
|
|
2003-08-20 16:35:12 +02:00
|
|
|
/*
|
|
|
|
Fake st_select_lex should have item list for correctref_array
|
|
|
|
allocation.
|
|
|
|
*/
|
|
|
|
fake_select_lex->item_list= item_list;
|
2003-07-05 16:21:39 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
JOIN_TAB *tab,*end;
|
2004-05-28 19:43:06 +02:00
|
|
|
for (tab=join->join_tab, end=tab+join->tables ;
|
|
|
|
tab && tab != end ;
|
|
|
|
tab++)
|
2003-07-05 16:21:39 +02:00
|
|
|
{
|
|
|
|
delete tab->select;
|
|
|
|
delete tab->quick;
|
|
|
|
}
|
2003-11-21 20:19:56 +01:00
|
|
|
join->init(thd, item_list, fake_select_lex->options, result);
|
2003-07-05 16:21:39 +02:00
|
|
|
}
|
2003-07-03 01:30:52 +02:00
|
|
|
res= mysql_select(thd, &fake_select_lex->ref_pointer_array,
|
|
|
|
&result_table_list,
|
2003-01-25 01:25:52 +01:00
|
|
|
0, item_list, NULL,
|
|
|
|
global_parameters->order_list.elements,
|
2002-09-03 08:50:36 +02:00
|
|
|
(ORDER*)global_parameters->order_list.first,
|
2002-05-08 22:14:40 +02:00
|
|
|
(ORDER*) NULL, NULL, (ORDER*) NULL,
|
2003-11-21 20:19:56 +01:00
|
|
|
fake_select_lex->options | SELECT_NO_UNLOCK,
|
2003-11-23 01:01:15 +01:00
|
|
|
result, this, fake_select_lex);
|
2004-05-03 12:58:01 +02:00
|
|
|
|
|
|
|
fake_select_lex->table_list.empty();
|
2003-08-23 20:21:02 +02:00
|
|
|
if (!res)
|
2004-10-05 13:47:10 +02:00
|
|
|
{
|
2003-08-23 20:21:02 +02:00
|
|
|
thd->limit_found_rows = (ulonglong)table->file->records + add_rows;
|
2004-10-06 18:14:33 +02:00
|
|
|
thd->examined_row_count+= examined_rows;
|
2004-10-05 13:47:10 +02:00
|
|
|
}
|
2003-04-08 02:54:02 +02:00
|
|
|
/*
|
|
|
|
Mark for slow query log if any of the union parts didn't use
|
|
|
|
indexes efficiently
|
|
|
|
*/
|
2001-10-19 16:43:30 +02:00
|
|
|
}
|
2001-08-02 05:29:50 +02:00
|
|
|
}
|
2003-12-19 18:52:13 +01:00
|
|
|
thd->lex->current_select= lex_select_save;
|
2001-08-02 05:29:50 +02:00
|
|
|
DBUG_RETURN(res);
|
|
|
|
}
|
|
|
|
|
2003-04-08 02:54:02 +02:00
|
|
|
|
2004-10-20 03:04:37 +02:00
|
|
|
bool st_select_lex_unit::cleanup()
|
2001-08-02 05:29:50 +02:00
|
|
|
{
|
2003-01-25 01:25:52 +01:00
|
|
|
int error= 0;
|
2003-03-18 10:17:48 +01:00
|
|
|
DBUG_ENTER("st_select_lex_unit::cleanup");
|
2003-01-25 01:25:52 +01:00
|
|
|
|
2004-02-10 01:18:22 +01:00
|
|
|
if (cleaned)
|
|
|
|
{
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(FALSE);
|
2004-02-10 01:18:22 +01:00
|
|
|
}
|
2004-03-23 13:26:54 +01:00
|
|
|
cleaned= 1;
|
2004-02-10 01:18:22 +01:00
|
|
|
|
2002-10-16 21:27:47 +02:00
|
|
|
if (union_result)
|
|
|
|
{
|
|
|
|
delete union_result;
|
2004-01-30 08:09:42 +01:00
|
|
|
union_result=0; // Safety
|
2003-01-25 01:25:52 +01:00
|
|
|
if (table)
|
|
|
|
free_tmp_table(thd, table);
|
2002-10-16 21:27:47 +02:00
|
|
|
table= 0; // Safety
|
|
|
|
}
|
2004-07-16 00:15:55 +02:00
|
|
|
|
|
|
|
for (SELECT_LEX *sl= first_select_in_union(); sl; sl= sl->next_select())
|
- don't call JOIN::join_free(1) twice for every join in JOIN::cleanup().
The reason it happened was that both, JOIN::cleanup() and JOIN::join_free(),
went over all nested joins and called cleanup/join_free for them.
For that:
- split recursive and non-recursive parts of JOIN::cleanup() and
JOIN::join_free()
- rename JOIN::cleanup to JOIN::destroy, as it actually destroys its
argument
- move the recursive part of JOIN::cleanup to st_select_lex::cleanup
- move the non-recursive part of JOIN::join_free to the introduced
method JOIN::cleanup().
sql/sql_lex.h:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup()
sql/sql_select.cc:
- remove two unused arguments from return_zero_rows
- split JOIN::join_free and JOIN::cleanup to recursive and non-recursive
parts.
- note, the assert in JOIN::join_free _does_ fail in having.test.
We have two options: a) propagate `full' flag to the nested joins.
We did it before, and this patch didn't change it. If so, we
can end up cleaning up an uncacheable JOIN (that is, the join that
we might need again).
b) evaluate own 'full' flag on every level. In this case, we might
end up with tables freed in mysql_unlock_read_tables, but not
cleaned up properly, and this may be even worse. The test suite
passes with both approaches, but not with the assert.
sql/sql_select.h:
- declarations for JOIN::cleanup() and JOIN::join_free()
sql/sql_union.cc:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup():
move the recursive part of JOIN::cleanup to it.
2005-06-24 20:48:12 +02:00
|
|
|
error|= sl->cleanup();
|
|
|
|
|
|
|
|
if (fake_select_lex)
|
2001-08-02 05:29:50 +02:00
|
|
|
{
|
- don't call JOIN::join_free(1) twice for every join in JOIN::cleanup().
The reason it happened was that both, JOIN::cleanup() and JOIN::join_free(),
went over all nested joins and called cleanup/join_free for them.
For that:
- split recursive and non-recursive parts of JOIN::cleanup() and
JOIN::join_free()
- rename JOIN::cleanup to JOIN::destroy, as it actually destroys its
argument
- move the recursive part of JOIN::cleanup to st_select_lex::cleanup
- move the non-recursive part of JOIN::join_free to the introduced
method JOIN::cleanup().
sql/sql_lex.h:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup()
sql/sql_select.cc:
- remove two unused arguments from return_zero_rows
- split JOIN::join_free and JOIN::cleanup to recursive and non-recursive
parts.
- note, the assert in JOIN::join_free _does_ fail in having.test.
We have two options: a) propagate `full' flag to the nested joins.
We did it before, and this patch didn't change it. If so, we
can end up cleaning up an uncacheable JOIN (that is, the join that
we might need again).
b) evaluate own 'full' flag on every level. In this case, we might
end up with tables freed in mysql_unlock_read_tables, but not
cleaned up properly, and this may be even worse. The test suite
passes with both approaches, but not with the assert.
sql/sql_select.h:
- declarations for JOIN::cleanup() and JOIN::join_free()
sql/sql_union.cc:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup():
move the recursive part of JOIN::cleanup to it.
2005-06-24 20:48:12 +02:00
|
|
|
JOIN *join;
|
|
|
|
if ((join= fake_select_lex->join))
|
new error for unsupported command in PS
fixed IN subselect with basic constant left expression
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
unchecked commands now is rejected by PS protocol to avoid serever crash
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
include/mysqld_error.h:
new error for unsupported command in PS
mysql-test/r/multi_update.result:
test sutes (BUG#3408, BUG#3411)
mysql-test/t/multi_update.test:
test sutes (BUG#3408, BUG#3411)
sql/item_cmpfunc.cc:
fixed IN subselect with basic constant left expression
sql/mysql_priv.h:
some function frop sql_parse.h become public
sql/set_var.cc:
check for SET command via PS
sql/set_var.h:
check for SET command via PS
sql/share/czech/errmsg.txt:
new error for unsupported command in PS
sql/share/danish/errmsg.txt:
new error for unsupported command in PS
sql/share/dutch/errmsg.txt:
new error for unsupported command in PS
sql/share/english/errmsg.txt:
new error for unsupported command in PS
sql/share/estonian/errmsg.txt:
new error for unsupported command in PS
sql/share/french/errmsg.txt:
new error for unsupported command in PS
sql/share/german/errmsg.txt:
new error for unsupported command in PS
sql/share/greek/errmsg.txt:
new error for unsupported command in PS
sql/share/hungarian/errmsg.txt:
new error for unsupported command in PS
sql/share/italian/errmsg.txt:
new error for unsupported command in PS
sql/share/japanese/errmsg.txt:
new error for unsupported command in PS
sql/share/korean/errmsg.txt:
new error for unsupported command in PS
sql/share/norwegian-ny/errmsg.txt:
new error for unsupported command in PS
sql/share/norwegian/errmsg.txt:
new error for unsupported command in PS
sql/share/polish/errmsg.txt:
new error for unsupported command in PS
sql/share/portuguese/errmsg.txt:
new error for unsupported command in PS
sql/share/romanian/errmsg.txt:
new error for unsupported command in PS
sql/share/russian/errmsg.txt:
new error for unsupported command in PS
sql/share/serbian/errmsg.txt:
new error for unsupported command in PS
sql/share/slovak/errmsg.txt:
new error for unsupported command in PS
sql/share/spanish/errmsg.txt:
new error for unsupported command in PS
sql/share/swedish/errmsg.txt:
new error for unsupported command in PS
sql/share/ukrainian/errmsg.txt:
new error for unsupported command in PS
sql/sql_lex.cc:
first table unlincking procedures for CREATE command
sql/sql_lex.h:
first table unlincking procedures for CREATE command
sql/sql_parse.cc:
used function to exclude first table from list
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
sql/sql_prepare.cc:
fixed a lot of commands to be compatible with PS
unchecked commands now is rejected to avoid serever crash
sql/sql_select.cc:
allow empty result for PS preparing
sql/sql_union.cc:
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
sql/sql_update.cc:
fixed update to use correct tables lists (BUG#3408)
sql/table.h:
flag to support multi update tables check (BUG#3408)
tests/client_test.c:
removed unsupported tables
fixed show table test
added new tests
2004-04-07 23:16:17 +02:00
|
|
|
{
|
- don't call JOIN::join_free(1) twice for every join in JOIN::cleanup().
The reason it happened was that both, JOIN::cleanup() and JOIN::join_free(),
went over all nested joins and called cleanup/join_free for them.
For that:
- split recursive and non-recursive parts of JOIN::cleanup() and
JOIN::join_free()
- rename JOIN::cleanup to JOIN::destroy, as it actually destroys its
argument
- move the recursive part of JOIN::cleanup to st_select_lex::cleanup
- move the non-recursive part of JOIN::join_free to the introduced
method JOIN::cleanup().
sql/sql_lex.h:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup()
sql/sql_select.cc:
- remove two unused arguments from return_zero_rows
- split JOIN::join_free and JOIN::cleanup to recursive and non-recursive
parts.
- note, the assert in JOIN::join_free _does_ fail in having.test.
We have two options: a) propagate `full' flag to the nested joins.
We did it before, and this patch didn't change it. If so, we
can end up cleaning up an uncacheable JOIN (that is, the join that
we might need again).
b) evaluate own 'full' flag on every level. In this case, we might
end up with tables freed in mysql_unlock_read_tables, but not
cleaned up properly, and this may be even worse. The test suite
passes with both approaches, but not with the assert.
sql/sql_select.h:
- declarations for JOIN::cleanup() and JOIN::join_free()
sql/sql_union.cc:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup():
move the recursive part of JOIN::cleanup to it.
2005-06-24 20:48:12 +02:00
|
|
|
join->tables_list= 0;
|
|
|
|
join->tables= 0;
|
new error for unsupported command in PS
fixed IN subselect with basic constant left expression
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
unchecked commands now is rejected by PS protocol to avoid serever crash
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
include/mysqld_error.h:
new error for unsupported command in PS
mysql-test/r/multi_update.result:
test sutes (BUG#3408, BUG#3411)
mysql-test/t/multi_update.test:
test sutes (BUG#3408, BUG#3411)
sql/item_cmpfunc.cc:
fixed IN subselect with basic constant left expression
sql/mysql_priv.h:
some function frop sql_parse.h become public
sql/set_var.cc:
check for SET command via PS
sql/set_var.h:
check for SET command via PS
sql/share/czech/errmsg.txt:
new error for unsupported command in PS
sql/share/danish/errmsg.txt:
new error for unsupported command in PS
sql/share/dutch/errmsg.txt:
new error for unsupported command in PS
sql/share/english/errmsg.txt:
new error for unsupported command in PS
sql/share/estonian/errmsg.txt:
new error for unsupported command in PS
sql/share/french/errmsg.txt:
new error for unsupported command in PS
sql/share/german/errmsg.txt:
new error for unsupported command in PS
sql/share/greek/errmsg.txt:
new error for unsupported command in PS
sql/share/hungarian/errmsg.txt:
new error for unsupported command in PS
sql/share/italian/errmsg.txt:
new error for unsupported command in PS
sql/share/japanese/errmsg.txt:
new error for unsupported command in PS
sql/share/korean/errmsg.txt:
new error for unsupported command in PS
sql/share/norwegian-ny/errmsg.txt:
new error for unsupported command in PS
sql/share/norwegian/errmsg.txt:
new error for unsupported command in PS
sql/share/polish/errmsg.txt:
new error for unsupported command in PS
sql/share/portuguese/errmsg.txt:
new error for unsupported command in PS
sql/share/romanian/errmsg.txt:
new error for unsupported command in PS
sql/share/russian/errmsg.txt:
new error for unsupported command in PS
sql/share/serbian/errmsg.txt:
new error for unsupported command in PS
sql/share/slovak/errmsg.txt:
new error for unsupported command in PS
sql/share/spanish/errmsg.txt:
new error for unsupported command in PS
sql/share/swedish/errmsg.txt:
new error for unsupported command in PS
sql/share/ukrainian/errmsg.txt:
new error for unsupported command in PS
sql/sql_lex.cc:
first table unlincking procedures for CREATE command
sql/sql_lex.h:
first table unlincking procedures for CREATE command
sql/sql_parse.cc:
used function to exclude first table from list
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
sql/sql_prepare.cc:
fixed a lot of commands to be compatible with PS
unchecked commands now is rejected to avoid serever crash
sql/sql_select.cc:
allow empty result for PS preparing
sql/sql_union.cc:
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
sql/sql_update.cc:
fixed update to use correct tables lists (BUG#3408)
sql/table.h:
flag to support multi update tables check (BUG#3408)
tests/client_test.c:
removed unsupported tables
fixed show table test
added new tests
2004-04-07 23:16:17 +02:00
|
|
|
}
|
- don't call JOIN::join_free(1) twice for every join in JOIN::cleanup().
The reason it happened was that both, JOIN::cleanup() and JOIN::join_free(),
went over all nested joins and called cleanup/join_free for them.
For that:
- split recursive and non-recursive parts of JOIN::cleanup() and
JOIN::join_free()
- rename JOIN::cleanup to JOIN::destroy, as it actually destroys its
argument
- move the recursive part of JOIN::cleanup to st_select_lex::cleanup
- move the non-recursive part of JOIN::join_free to the introduced
method JOIN::cleanup().
sql/sql_lex.h:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup()
sql/sql_select.cc:
- remove two unused arguments from return_zero_rows
- split JOIN::join_free and JOIN::cleanup to recursive and non-recursive
parts.
- note, the assert in JOIN::join_free _does_ fail in having.test.
We have two options: a) propagate `full' flag to the nested joins.
We did it before, and this patch didn't change it. If so, we
can end up cleaning up an uncacheable JOIN (that is, the join that
we might need again).
b) evaluate own 'full' flag on every level. In this case, we might
end up with tables freed in mysql_unlock_read_tables, but not
cleaned up properly, and this may be even worse. The test suite
passes with both approaches, but not with the assert.
sql/sql_select.h:
- declarations for JOIN::cleanup() and JOIN::join_free()
sql/sql_union.cc:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup():
move the recursive part of JOIN::cleanup to it.
2005-06-24 20:48:12 +02:00
|
|
|
error|= fake_select_lex->cleanup();
|
2003-07-05 16:21:39 +02:00
|
|
|
}
|
2004-07-16 00:15:55 +02:00
|
|
|
|
2003-01-25 01:25:52 +01:00
|
|
|
DBUG_RETURN(error);
|
2001-08-02 05:29:50 +02:00
|
|
|
}
|
2004-02-08 19:14:13 +01:00
|
|
|
|
|
|
|
|
|
|
|
void st_select_lex_unit::reinit_exec_mechanism()
|
|
|
|
{
|
|
|
|
prepared= optimized= executed= 0;
|
2004-03-20 12:36:26 +01:00
|
|
|
#ifndef DBUG_OFF
|
2004-03-23 13:26:54 +01:00
|
|
|
if (first_select()->next_select())
|
2004-03-20 12:36:26 +01:00
|
|
|
{
|
2004-03-23 13:26:54 +01:00
|
|
|
List_iterator_fast<Item> it(item_list);
|
|
|
|
Item *field;
|
|
|
|
while ((field= it++))
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
we can't cleanup here, because it broke link to temporary table field,
|
|
|
|
but have to drop fixed flag to allow next fix_field of this field
|
|
|
|
during re-executing
|
|
|
|
*/
|
|
|
|
field->fixed= 0;
|
|
|
|
}
|
2004-03-20 12:36:26 +01:00
|
|
|
}
|
|
|
|
#endif
|
2004-02-08 19:14:13 +01:00
|
|
|
}
|
2004-05-07 22:06:11 +02:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
change select_result object of unit
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
st_select_lex_unit::change_result()
|
|
|
|
result new select_result object
|
|
|
|
old_result old select_result object
|
|
|
|
|
|
|
|
RETURN
|
2004-10-20 03:04:37 +02:00
|
|
|
FALSE - OK
|
|
|
|
TRUE - error
|
2004-05-07 22:06:11 +02:00
|
|
|
*/
|
|
|
|
|
2004-10-20 03:04:37 +02:00
|
|
|
bool st_select_lex_unit::change_result(select_subselect *result,
|
|
|
|
select_subselect *old_result)
|
2004-05-07 22:06:11 +02:00
|
|
|
{
|
2004-10-20 03:04:37 +02:00
|
|
|
bool res= FALSE;
|
2004-05-07 22:06:11 +02:00
|
|
|
for (SELECT_LEX *sl= first_select_in_union(); sl; sl= sl->next_select())
|
|
|
|
{
|
|
|
|
if (sl->join && sl->join->result == old_result)
|
2004-10-20 03:04:37 +02:00
|
|
|
if (sl->join->change_result(result))
|
|
|
|
return TRUE;
|
2004-05-07 22:06:11 +02:00
|
|
|
}
|
|
|
|
if (fake_select_lex && fake_select_lex->join)
|
|
|
|
res= fake_select_lex->join->change_result(result);
|
|
|
|
return (res);
|
|
|
|
}
|
- don't call JOIN::join_free(1) twice for every join in JOIN::cleanup().
The reason it happened was that both, JOIN::cleanup() and JOIN::join_free(),
went over all nested joins and called cleanup/join_free for them.
For that:
- split recursive and non-recursive parts of JOIN::cleanup() and
JOIN::join_free()
- rename JOIN::cleanup to JOIN::destroy, as it actually destroys its
argument
- move the recursive part of JOIN::cleanup to st_select_lex::cleanup
- move the non-recursive part of JOIN::join_free to the introduced
method JOIN::cleanup().
sql/sql_lex.h:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup()
sql/sql_select.cc:
- remove two unused arguments from return_zero_rows
- split JOIN::join_free and JOIN::cleanup to recursive and non-recursive
parts.
- note, the assert in JOIN::join_free _does_ fail in having.test.
We have two options: a) propagate `full' flag to the nested joins.
We did it before, and this patch didn't change it. If so, we
can end up cleaning up an uncacheable JOIN (that is, the join that
we might need again).
b) evaluate own 'full' flag on every level. In this case, we might
end up with tables freed in mysql_unlock_read_tables, but not
cleaned up properly, and this may be even worse. The test suite
passes with both approaches, but not with the assert.
sql/sql_select.h:
- declarations for JOIN::cleanup() and JOIN::join_free()
sql/sql_union.cc:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup():
move the recursive part of JOIN::cleanup to it.
2005-06-24 20:48:12 +02:00
|
|
|
|
|
|
|
|
|
|
|
bool st_select_lex::cleanup()
|
|
|
|
{
|
|
|
|
bool error= FALSE;
|
|
|
|
DBUG_ENTER("st_select_lex::cleanup()");
|
|
|
|
|
|
|
|
if (join)
|
|
|
|
{
|
2005-06-29 10:50:29 +02:00
|
|
|
DBUG_ASSERT((st_select_lex*)join->select_lex == this);
|
2005-07-04 02:42:33 +02:00
|
|
|
error= join->destroy();
|
- don't call JOIN::join_free(1) twice for every join in JOIN::cleanup().
The reason it happened was that both, JOIN::cleanup() and JOIN::join_free(),
went over all nested joins and called cleanup/join_free for them.
For that:
- split recursive and non-recursive parts of JOIN::cleanup() and
JOIN::join_free()
- rename JOIN::cleanup to JOIN::destroy, as it actually destroys its
argument
- move the recursive part of JOIN::cleanup to st_select_lex::cleanup
- move the non-recursive part of JOIN::join_free to the introduced
method JOIN::cleanup().
sql/sql_lex.h:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup()
sql/sql_select.cc:
- remove two unused arguments from return_zero_rows
- split JOIN::join_free and JOIN::cleanup to recursive and non-recursive
parts.
- note, the assert in JOIN::join_free _does_ fail in having.test.
We have two options: a) propagate `full' flag to the nested joins.
We did it before, and this patch didn't change it. If so, we
can end up cleaning up an uncacheable JOIN (that is, the join that
we might need again).
b) evaluate own 'full' flag on every level. In this case, we might
end up with tables freed in mysql_unlock_read_tables, but not
cleaned up properly, and this may be even worse. The test suite
passes with both approaches, but not with the assert.
sql/sql_select.h:
- declarations for JOIN::cleanup() and JOIN::join_free()
sql/sql_union.cc:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup():
move the recursive part of JOIN::cleanup to it.
2005-06-24 20:48:12 +02:00
|
|
|
delete join;
|
|
|
|
join= 0;
|
|
|
|
}
|
|
|
|
for (SELECT_LEX_UNIT *lex_unit= first_inner_unit(); lex_unit ;
|
|
|
|
lex_unit= lex_unit->next_unit())
|
|
|
|
{
|
2005-07-04 02:42:33 +02:00
|
|
|
error= (bool) ((uint) error | (uint) lex_unit->cleanup());
|
- don't call JOIN::join_free(1) twice for every join in JOIN::cleanup().
The reason it happened was that both, JOIN::cleanup() and JOIN::join_free(),
went over all nested joins and called cleanup/join_free for them.
For that:
- split recursive and non-recursive parts of JOIN::cleanup() and
JOIN::join_free()
- rename JOIN::cleanup to JOIN::destroy, as it actually destroys its
argument
- move the recursive part of JOIN::cleanup to st_select_lex::cleanup
- move the non-recursive part of JOIN::join_free to the introduced
method JOIN::cleanup().
sql/sql_lex.h:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup()
sql/sql_select.cc:
- remove two unused arguments from return_zero_rows
- split JOIN::join_free and JOIN::cleanup to recursive and non-recursive
parts.
- note, the assert in JOIN::join_free _does_ fail in having.test.
We have two options: a) propagate `full' flag to the nested joins.
We did it before, and this patch didn't change it. If so, we
can end up cleaning up an uncacheable JOIN (that is, the join that
we might need again).
b) evaluate own 'full' flag on every level. In this case, we might
end up with tables freed in mysql_unlock_read_tables, but not
cleaned up properly, and this may be even worse. The test suite
passes with both approaches, but not with the assert.
sql/sql_select.h:
- declarations for JOIN::cleanup() and JOIN::join_free()
sql/sql_union.cc:
Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup():
move the recursive part of JOIN::cleanup to it.
2005-06-24 20:48:12 +02:00
|
|
|
}
|
|
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|