mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
a8caad316a
Made a some new buffers thread specific and changeable. Resize of key_buffer. AUTO_COMMIT -> AUTOCOMMIT Fixed mutex bug in DROP DATABASE Fixed bug when using auto_increment as second part of a key where first part could include NULL. Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers. Don't write message to error log when slave reconnects becasue of timeout. Fixed possible update problem when using DELETE/UPDATE on small tables (In some cases we used index even if table scanning would be better) A lot of minior code cleanups BitKeeper/deleted/.del-net.c~ef21d6402bb882f9: Delete: libmysql/net.c BitKeeper/etc/ignore: added libmysql/net.c Docs/manual.texi: New SET syntax & system variables. client/client_priv.h: moved order of include files client/mysql.cc: Removed compiler warning client/mysqladmin.c: Use new SHOW GLOBAL syntax (if server supports it) configure.in: version change include/Makefile.am: indentation cleanup include/my_getopt.h: Made some helper functions global include/my_sys.h: Removed not used code include/myisam.h: Added extra argument to ..._extra() include/myisammrg.h: Added extra argument to ..._extra() include/mysql_com.h: changed NET to be able to support changeable system variables include/mysql_embed.h: Added MYSQL_SERVER_SUFFIX include/mysql_version.h.in: Added check of multiple including (needed for embedded library) include/mysqld_error.h: New error messages innobase/dict/dict0dict.c: Remove compiler warnings innobase/include/ut0mem.h: Remove compiler warnings innobase/include/ut0mem.ic: Remove compiler warnings isam/isamchk.c: new init_key_cache() arguments isam/isamlog.c: new init_key_cache() arguments isam/test2.c: new init_key_cache() arguments isam/test3.c: new init_key_cache() arguments libmysql/Makefile.am: Removed net.c (Automaticly make it from net_serv.cc) libmysql/Makefile.shared: Removed net.c (Automaticly make it from net_serv.cc) libmysql/libmysql.c: Changeable system variables libmysqld/Makefile.am: Added set_var.cc file libmysqld/embedded_priv.h: Changed order of include fiels libmysqld/lib_sql.cc: merge with mysqld.cc (for changeable variables) libmysqld/libmysqld.c: New changeable system variables myisam/mi_check.c: Added extra argument to ..._extra() myisam/mi_extra.c: Added extra argument to ..._extra() myisam/mi_open.c: Removed not used variable myisam/mi_test1.c: Changed call to init_key_cache myisam/mi_test2.c: Added extra argument to ..._extra() myisam/mi_test3.c: Added extra argument to ..._extra() myisam/mi_write.c: Add cache size argument to bulk-insert-init myisam/myisamchk.c: Use new key cache myisam/myisamdef.h: new mi_init_bulk_insert() arguments myisam/myisamlog.c: Added extra argument to ..._extra() myisam/myisampack.c: Added extra argument to ..._extra() myisammrg/myrg_extra.c: Added extra argument to ..._extra() myisammrg/myrg_rrnd.c: Added extra argument to ..._extra() mysql-test/r/insert_select.result: New changeable system variables mysql-test/r/key.result: Test of bug in auto_increment mysql-test/r/query_cache.result: New changeable system variables mysql-test/r/rpl000001.result: New changeable system variables mysql-test/r/rpl000016.result: New changeable system variables mysql-test/r/union.result: New changeable system variables mysql-test/r/user_var.result: New changeable system variables mysql-test/r/variables.result: New changeable system variables mysql-test/t/key.test: Test of bug in auto_increment mysql-test/t/query_cache.test: New changeable system variables mysql-test/t/rpl000001.test: New changeable system variables mysql-test/t/rpl000009.test: New changeable system variables mysql-test/t/rpl000016.test: New changeable system variables mysql-test/t/rpl_compat.test: New changeable system variables mysql-test/t/union.test: New changeable system variables mysql-test/t/user_var.test: New changeable system variables mysql-test/t/variables.test: New changeable system variables mysys/default.c: Bigger default memory allocation mysys/mf_iocache.c: Removed compiler warning mysys/mf_keycache.c: Made key cache resizable on the fly Removed not needed extra argument to init_key_cache() mysys/my_getopt.c: Made some helper functions global sql/Makefile.am: Aded set_var.cc sql/convert.cc: Comment cleanup sql/field.cc: new changeable system variables sql/filesort.cc: new changeable system variables sql/ha_berkeley.cc: AUTO_COMMIT -> AUTOCOMMIT sql/ha_innodb.cc: new changeable system variables sql/ha_myisam.cc: Added extra argument to ..._extra() sql/ha_myisam.h: Added extra argument to ..._extra() sql/ha_myisammrg.cc: Added extra argument to ..._extra() sql/ha_myisammrg.h: Added extra argument to ..._extra() sql/handler.cc: Added extra argument to ..._extra() Added resize of key cache Change ha_table_typelib for use with new system variables sql/handler.h: Added extra argument to ..._extra() sql/item.cc: new changeable system variables sql/item.h: Added better support of Item_uint sql/item_func.cc: Added support for SET @@[global | session] system_variable sql/item_strfunc.cc: new changeable system variables sql/key.cc: Fixed bug in auto_increment on second part keys sql/lex.h: Removed not needed keywords sql/log.cc: new changeable system variables sql/log_event.cc: new changeable system variables sql/log_event.h: Removed not needed var reference sql/mini_client.cc: new changeable system variables code cleanup sql/mini_client.h: Indentation cleanup sql/mysql_priv.h: Changed order of include files & variables to make file more readable sql/mysqld.cc: Changed order of variables to make file more readable. Support for changeable variables Rename of system variables Moved init_vars to set_var.cc Changed output of --help sql/net_pkg.cc: Added my_net_local_init() to make it possible to set different defaults for network connection depending if you are a client, embedded library or server. sql/net_serv.cc: new changeable system variables To support this, some global variables had to be move to the NET structure. sql/records.cc: new changeable system variables use extra_opt() sql/repl_failsafe.cc: new changeable system variables minior code cleanups sql/repl_failsafe.h: removed not needed external var reference sql/share/czech/errmsg.txt: new changeable system variables sql/share/danish/errmsg.txt: new changeable system variables sql/share/dutch/errmsg.txt: new changeable system variables sql/share/english/errmsg.txt: new changeable system variables sql/share/estonian/errmsg.txt: new changeable system variables sql/share/french/errmsg.txt: new changeable system variables sql/share/german/errmsg.txt: new changeable system variables sql/share/greek/errmsg.txt: new changeable system variables sql/share/hungarian/errmsg.txt: new changeable system variables sql/share/italian/errmsg.txt: new changeable system variables sql/share/japanese/errmsg.txt: new changeable system variables sql/share/korean/errmsg.txt: new changeable system variables sql/share/norwegian-ny/errmsg.txt: new changeable system variables sql/share/norwegian/errmsg.txt: new changeable system variables sql/share/polish/errmsg.txt: new changeable system variables sql/share/portuguese/errmsg.txt: new changeable system variables sql/share/romanian/errmsg.txt: new changeable system variables sql/share/russian/errmsg.txt: new changeable system variables sql/share/slovak/errmsg.txt: new changeable system variables sql/share/spanish/errmsg.txt: new changeable system variables sql/share/swedish/errmsg.txt: new changeable system variables sql/share/ukrainian/errmsg.txt: new changeable system variables sql/slave.cc: new changeable system variables Added some suppression of error messages Initialize current_thd for all slave threads. sql/sql_acl.cc: Added checking of arguments for SET PASSWORD (for new SET defintion) sql/sql_acl.h: new prototypes sql/sql_base.cc: new changeable system variables sql/sql_cache.cc: new changeable system variables sql/sql_cache.h: Renamed some arguments to make code more readable sql/sql_class.cc: new changeable system variables sql/sql_class.h: New changeable system variables Code cleanup sql/sql_db.cc: Fixed bug in DROP DATABASE sql/sql_delete.cc: Usage of wrong define in test (possible speed problem) sql/sql_insert.cc: use extra_opt() Code cleanup sql/sql_lex.cc: Added support for SET @@[global | session] system_variable sql/sql_lex.h: Added support for SET @@[global | session] system_variable sql/sql_load.cc: Cleanup for embedded library Use extra_opt() sql/sql_parse.cc: Cleanup for embedded library New changeable system variables sql/sql_repl.cc: new changeable system variables sql/sql_repl.h: Fixed variable definitions sql/sql_select.cc: new changeable system variables sql/sql_show.cc: New changeable system variables sql/sql_table.cc: Fixed bug in DROP DATABASE sql/sql_union.cc: New changeable system variables sql/sql_update.cc: Usage of wrong define in test (possible speed problem) sql/sql_yacc.yy: New changeable system variables sql/structs.h: Added typedef for SHOW_VAR sql/table.cc: Fixed bug in auto_increment on second part keys sql/uniques.cc: Comment fix sql/unireg.h: A
280 lines
7.9 KiB
C++
280 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->variables.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;
|
|
}
|