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

10
sql/sql_insert.cc
View File

@ -483,7 +483,8 @@ int write_record(TABLE *table,COPY_INFO *info)
key_copy((byte*) key,table,key_nr,0);
if ((error=(table->file->index_read_idx(table->record[1],key_nr,
(byte*) key,
table->key_info[key_nr].key_length,
table->key_info[key_nr].
key_length,
HA_READ_KEY_EXACT))))
goto err;
}
@ -495,7 +496,7 @@ int write_record(TABLE *table,COPY_INFO *info)
*/
store_record(table,insert_values);
restore_record(table,record[1]);
if (fill_record(*info->update_fields,*info->update_values))
if (fill_record(*info->update_fields, *info->update_values, 0))
goto err;
if ((error=table->file->update_row(table->record[1],table->record[0])))
goto err;
@ -506,10 +507,11 @@ int write_record(TABLE *table,COPY_INFO *info)
{
if (last_uniq_key(table,key_nr))
{
if ((error=table->file->update_row(table->record[1],table->record[0])))
if ((error=table->file->update_row(table->record[1],
table->record[0])))
goto err;
info->deleted++;
break; /* Update logfile and count */
break; /* Update logfile and count */
}
else if ((error=table->file->delete_row(table->record[1])))
goto err;