database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

After merge fixes

Browse Source 
Added initialization of all important global variables
This commit is contained in:
monty@mashka.mysql.fi
2003-05-21 21:39:58 +03:00
parent dd2b7918cd
commit 6aa8929cf3
64 changed files with 694 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_update.cc
View File

@ -97,7 +97,7 @@ int mysql_update(THD *thd,
setup_ref_array(thd, &thd->lex.select_lex.ref_pointer_array,
order_num) ||
setup_order(thd, thd->lex.select_lex.ref_pointer_array,
&tables, fields, all_fields, order) ||
&tables, all_fields, all_fields, order) ||
setup_ftfuncs(&thd->lex.select_lex))
DBUG_RETURN(-1); /* purecov: inspected */
@ -207,7 +207,7 @@ int mysql_update(THD *thd,
MYF(MY_FAE | MY_ZEROFILL));
if (!(sortorder=make_unireg_sortorder(order, &length)) ||
(table->sort.found_records = filesort(thd, table, sortorder, length,
select, 0L, limit,
select, limit,
&examined_rows))
== HA_POS_ERROR)
{
@ -755,7 +755,7 @@ bool multi_update::send_data(List<Item> &not_used_values)
{
table->status|= STATUS_UPDATED;
store_record(table,record[1]);
if (fill_record(*fields_for_table[offset], *values_for_table[offset]), 0)
if (fill_record(*fields_for_table[offset], *values_for_table[offset], 0))
DBUG_RETURN(1);
found++;
if (compare_record(table, thd->query_id))
@ -793,7 +793,7 @@ bool multi_update::send_data(List<Item> &not_used_values)
(error != HA_ERR_FOUND_DUPP_KEY &&
error != HA_ERR_FOUND_DUPP_UNIQUE))
{
if (create_myisam_from_heap(thd, table, tmp_table_param + offset,
if (create_myisam_from_heap(thd, tmp_table, tmp_table_param + offset,
error, 1))
{
do_update=0;