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

Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

Browse Source 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2002-12-09 14:04:29 +02:00
parent 270895bee3 632dff01d1
commit 444690caa4
5 changed files with 46 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_select.cc
View File

@ -57,7 +57,7 @@ static store_key *get_store_key(THD *thd,
static bool make_simple_join(JOIN *join,TABLE *tmp_table);
static bool make_join_select(JOIN *join,SQL_SELECT *select,COND *item);
static void make_join_readinfo(JOIN *join,uint options);
static void join_free(JOIN *join);
static void join_free(JOIN *join, bool full);
static bool only_eq_ref_tables(JOIN *join,ORDER *order,table_map tables);
static void update_depend_map(JOIN *join);
static void update_depend_map(JOIN *join, ORDER *order);
@ -403,8 +403,8 @@ JOIN::optimize()
{
// quick abort
delete procedure;
error= thd->net.report_error ? -1 : 1;
DBUG_RETURN(-1); // Return without cleanup
error= thd->fatal_error ? -1 : 1;
DBUG_RETURN(error);
}
if (cond_value == Item::COND_FALSE ||
@ -902,7 +902,7 @@ JOIN::exec()
DBUG_PRINT("info",("Creating group table"));
/* Free first data from old join */
join_free(this);
join_free(this, 0);
if (make_simple_join(this, exec_tmp_table))
DBUG_VOID_RETURN;
calc_group_buffer(this, group_list);
@ -953,7 +953,7 @@ JOIN::exec()
if (exec_tmp_table->distinct)
select_distinct=0; /* Each row is unique */
join_free(this); /* Free quick selects */
join_free(this, 0); /* Free quick selects */
if (select_distinct && ! group_list)
{
thd->proc_info="Removing duplicates";
@ -1068,7 +1068,7 @@ JOIN::cleanup(THD *thd)
DBUG_ENTER("JOIN::cleanup");
lock=0; // It's faster to unlock later
join_free(this);
join_free(this, 1);
if (exec_tmp_table)
free_tmp_table(thd, exec_tmp_table);
delete select;
@ -3035,7 +3035,7 @@ bool error_if_full_join(JOIN *join)
static void
join_free(JOIN *join)
join_free(JOIN *join, bool full)
{
JOIN_TAB *tab,*end;
DBUG_ENTER("join_free");
@ -3048,7 +3048,7 @@ join_free(JOIN *join)
*/
if (join->tables > join->const_tables) // Test for not-const tables
free_io_cache(join->table[join->const_tables]);
if (join->select_lex->dependent)
if (join->select_lex->dependent && !full)
for (tab=join->join_tab,end=tab+join->tables ; tab != end ; tab++)
{
if (tab->table)
@ -4680,7 +4680,7 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure)
error=0;
if (!table) // If sending data to client
{
join_free(join); // Unlock all cursors
join_free(join, 0); // Unlock all cursors
if (join->result->send_eof())
error= 1; // Don't send error
}