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

Browse Source 
sql/item.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/unireg.h:
  Auto merged
This commit is contained in:
unknown
2003-05-06 01:42:33 +03:00
parent b96aaea7e1 79c53934be
commit 429c488fce
21 changed files with 170 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_select.cc
View File

@ -4384,7 +4384,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
if (!(table->record[0]= (byte *) my_malloc(alloc_length*3, MYF(MY_WME))))
goto err;
table->record[1]= table->record[0]+alloc_length;
table->record[2]= table->record[1]+alloc_length;
table->default_values= table->record[1]+alloc_length;
}
copy_func[0]=0; // End marker
@ -4458,7 +4458,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
param->copy_field_end=copy;
param->recinfo=recinfo;
store_record(table,2); // Make empty default record
store_record(table,default_values); // Make empty default record
if (thd->variables.tmp_table_size == ~(ulong) 0) // No limit
table->max_rows= ~(ha_rows) 0;
@ -5061,7 +5061,7 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records)
if (!found && on_expr)
{ // OUTER JOIN
restore_record(join_tab->table,2); // Make empty record
restore_record(join_tab->table,default_values); // Make empty record
mark_as_null_row(join_tab->table); // For group by without error
if (!select_cond || select_cond->val_int())
{
@ -5207,10 +5207,10 @@ join_read_system(JOIN_TAB *tab)
empty_record(table); // Make empty record
return -1;
}
store_record(table,1);
store_record(table,record[1]);
}
else if (!table->status) // Only happens with left join
restore_record(table,1); // restore old record
restore_record(table,record[1]); // restore old record
table->null_row=0;
return table->status ? -1 : 0;
}
@ -5247,12 +5247,12 @@ join_read_const(JOIN_TAB *tab)
}
return -1;
}
store_record(table,1);
store_record(table,record[1]);
}
else if (!(table->status & ~STATUS_NULL_ROW)) // Only happens with left join
{
table->status=0;
restore_record(table,1); // restore old record
restore_record(table,record[1]); // restore old record
}
table->null_row=0;
return table->status ? -1 : 0;
@ -5849,7 +5849,7 @@ end_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
join->tmp_table_param.group_buff,0,
HA_READ_KEY_EXACT))
{ /* Update old record */
restore_record(table,1);
restore_record(table,record[1]);
update_tmptable_sum_func(join->sum_funcs,table);
if ((error=table->file->update_row(table->record[1],
table->record[0])))
@ -5918,7 +5918,7 @@ end_unique_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
table->file->print_error(error,MYF(0)); /* purecov: inspected */
DBUG_RETURN(-1); /* purecov: inspected */
}
restore_record(table,1);
restore_record(table,record[1]);
update_tmptable_sum_func(join->sum_funcs,table);
if ((error=table->file->update_row(table->record[1],
table->record[0])))