Below is the list of changes that have just been committed into a local
5.0 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.1654 04/11/18 13:42:52 mats@stripped +11 -0
In preparation for adding code to do row-level logging, we make these
changes:
- We introduce non-virtual public member functions 'execute_*_row' to
be used as the public interface to the virtual row-level
functions. These member functions will in turn call the old virtual
row-level functions.
- We make the old row-level virtual member functions private to
prevent code from accidentally calling them instead of the interface
functions above.
- We rename all calls to '*_row' member functions to 'execute_*_row'
function calls.
sql/sql_show.cc
1.170 04/11/18 13:03:47 mats@stripped +14 -14
Changes to use new row-level handler interface
sql/sql_insert.cc
1.122 04/11/18 13:03:46 mats@stripped +7 -6
Changes to use new row-level handler interface
sql/sql_update.cc
1.129 04/11/18 13:03:45 mats@stripped +7 -7
Changes to use new row-level handler interface
sql/sql_delete.cc
1.134 04/11/18 13:03:44 mats@stripped +3 -3
Changes to use new row-level handler interface
sql/sp.cc
1.63 04/11/18 13:03:43 mats@stripped +4 -4
Changes to use new row-level handler interface
sql/sql_udf.cc
1.40 04/11/18 13:03:42 mats@stripped +2 -2
Changes to use new row-level handler interface
sql/sql_acl.cc
1.109 04/11/18 13:03:41 mats@stripped +22 -17
Changes to use new row-level handler interface
sql/sql_select.cc
1.252 04/11/18 13:03:39 mats@stripped +14 -14
Changes to use new row-level handler interface
sql/sql_table.cc
1.198 04/11/18 13:03:38 mats@stripped +1 -1
Changes to use new row-level handler interface
sql/item_sum.cc
1.110 04/11/18 13:03:37 mats@stripped +2 -2
Changes to use new row-level handler interface
sql/handler.h
1.110 04/11/18 13:00:31 mats@stripped +20 -5
- Adding new public member functions as interface to row-level primitives.
- Making old row-level primitives private.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: mats
# Host: tuna.ndb.mysql.com
# Root: /orca/space/bk/w1012-mysql-5.0
--- 1.109/sql/handler.h 2004-11-13 11:55:43 +01:00
+++ 1.110/sql/handler.h 2004-11-18 13:00:31 +01:00
@@ -360,11 +360,14 @@
uint get_index(void) const { return active_index; }
virtual int open(const char *name, int mode, uint test_if_locked)=0;
virtual int close(void)=0;
- virtual int write_row(byte * buf) { return HA_ERR_WRONG_COMMAND; }
- virtual int update_row(const byte * old_data, byte * new_data)
- { return HA_ERR_WRONG_COMMAND; }
- virtual int delete_row(const byte * buf)
- { return HA_ERR_WRONG_COMMAND; }
+
+ int execute_write_row(byte * buf)
+ { return write_row(buf); }
+ int execute_update_row(const byte * old_data, byte * new_data)
+ { return update_row(old_data, new_data); }
+ int execute_delete_row(const byte * buf)
+ { return delete_row(buf); }
+
virtual int index_read(byte * buf, const byte * key,
uint key_len, enum ha_rkey_function find_flag)
{ return HA_ERR_WRONG_COMMAND; }
@@ -537,6 +540,18 @@
{
return memcmp(ref1, ref2, ref_length);
}
+
+private:
+ /*
+ Row-level primitives for storage engines.
+ These should be overridden by the storage engine class. To call
+ these methods, use the corresponding 'execute_*' method above.
+ */
+ virtual int write_row(byte * buf) { return HA_ERR_WRONG_COMMAND; }
+ virtual int update_row(const byte * old_data, byte * new_data)
+ { return HA_ERR_WRONG_COMMAND; }
+ virtual int delete_row(const byte * buf)
+ { return HA_ERR_WRONG_COMMAND; }
};
/* Some extern variables used with handlers */
--- 1.109/sql/item_sum.cc 2004-11-12 14:36:25 +01:00
+++ 1.110/sql/item_sum.cc 2004-11-18 13:03:37 +01:00
@@ -1241,7 +1241,7 @@
restore_record(table,default_values) in setup()
*/
memcpy(buf + item->rec_offset, key, item->tree->size_of_element);
- if ((error = item->table->file->write_row(buf)))
+ if ((error = item->table->file->execute_write_row(buf)))
{
if (error != HA_ERR_FOUND_DUPP_KEY &&
error != HA_ERR_FOUND_DUPP_UNIQUE)
@@ -1494,7 +1494,7 @@
tree->custom_arg))
return 1;
}
- else if ((error=table->file->write_row(table->record[0])))
+ else if ((error=table->file->execute_write_row(table->record[0])))
{
if (error != HA_ERR_FOUND_DUPP_KEY &&
error != HA_ERR_FOUND_DUPP_UNIQUE)
--- 1.108/sql/sql_acl.cc 2004-11-15 17:20:40 +01:00
+++ 1.109/sql/sql_acl.cc 2004-11-18 13:03:41 +01:00
@@ -1477,7 +1477,8 @@
}
store_record(table,record[1]);
table->field[2]->store(new_password, new_password_len, &my_charset_latin1);
- if ((error=table->file->update_row(table->record[1],table->record[0])))
+ if ((error=table->file->execute_update_row(table->record[1],
+ table->record[0])))
{
table->file->print_error(error,MYF(0)); /* purecov: deadcode */
goto end; /* purecov: deadcode */
@@ -1678,14 +1679,15 @@
use mysqld even if he doesn't have any privileges in the user table!
*/
if (cmp_record(table,record[1]) &&
- (error=table->file->update_row(table->record[1],table->record[0])))
+ (error=table->file->execute_update_row(table->record[1],
+ table->record[0])))
{ // This should never happen
table->file->print_error(error,MYF(0)); /* purecov: deadcode */
error= -1; /* purecov: deadcode */
goto end; /* purecov: deadcode */
}
}
- else if ((error=table->file->write_row(table->record[0]))) // insert
+ else if ((error=table->file->execute_write_row(table->record[0]))) // insert
{ // This should never happen
if (error && error != HA_ERR_FOUND_DUPP_KEY &&
error != HA_ERR_FOUND_DUPP_UNIQUE) /* purecov: inspected */
@@ -1788,16 +1790,17 @@
/* update old existing row */
if (rights)
{
- if ((error=table->file->update_row(table->record[1],table->record[0])))
+ if ((error=table->file->execute_update_row(table->record[1],
+ table->record[0])))
goto table_error; /* purecov: deadcode */
}
else /* must have been a revoke of all privileges */
{
- if ((error = table->file->delete_row(table->record[1])))
+ if ((error = table->file->execute_delete_row(table->record[1])))
goto table_error; /* purecov: deadcode */
}
}
- else if (rights && (error=table->file->write_row(table->record[0])))
+ else if (rights && (error=table->file->execute_write_row(table->record[0])))
{
if (error && error != HA_ERR_FOUND_DUPP_KEY) /* purecov: inspected */
goto table_error; /* purecov: deadcode */
@@ -2097,9 +2100,10 @@
if (old_row_exists)
{
if (privileges)
- error=table->file->update_row(table->record[1],table->record[0]);
+ error=table->file->execute_update_row(table->record[1],
+ table->record[0]);
else
- error=table->file->delete_row(table->record[1]);
+ error=table->file->execute_delete_row(table->record[1]);
if (error)
{
table->file->print_error(error,MYF(0)); /* purecov: inspected */
@@ -2114,7 +2118,7 @@
}
else // new grant
{
- if ((error=table->file->write_row(table->record[0])))
+ if ((error=table->file->execute_write_row(table->record[0])))
{
table->file->print_error(error,MYF(0)); /* purecov: inspected */
result= -1; /* purecov: inspected */
@@ -2159,7 +2163,7 @@
if (privileges)
{
int tmp_error;
- if ((tmp_error=table->file->update_row(table->record[1],
+ if ((tmp_error=table->file->execute_update_row(table->record[1],
table->record[0])))
{ /* purecov: deadcode */
table->file->print_error(tmp_error,MYF(0)); /* purecov: deadcode */
@@ -2172,7 +2176,7 @@
else
{
int tmp_error;
- if ((tmp_error = table->file->delete_row(table->record[1])))
+ if ((tmp_error = table->file->execute_delete_row(table->record[1])))
{ /* purecov: deadcode */
table->file->print_error(tmp_error,MYF(0)); /* purecov: deadcode */
result= -1; /* purecov: deadcode */
@@ -2275,15 +2279,16 @@
{
if (store_table_rights || store_col_rights)
{
- if ((error=table->file->update_row(table->record[1],table->record[0])))
+ if ((error=table->file->execute_update_row(table->record[1],
+ table->record[0])))
goto table_error; /* purecov: deadcode */
}
- else if ((error = table->file->delete_row(table->record[1])))
+ else if ((error = table->file->execute_delete_row(table->record[1])))
goto table_error; /* purecov: deadcode */
}
else
{
- error=table->file->write_row(table->record[0]);
+ error=table->file->execute_write_row(table->record[0]);
if (error && error != HA_ERR_FOUND_DUPP_KEY)
goto table_error; /* purecov: deadcode */
}
@@ -3721,8 +3726,8 @@
HA_READ_KEY_EXACT))
{
int error;
- if ((error = tables[0].table->file->delete_row(tables[0].table->
- record[0])))
+ if ((error = tables[0].table->file->execute_delete_row(tables[0].table
+ ->record[0])))
{
tables[0].table->file->print_error(error, MYF(0));
DBUG_RETURN(TRUE);
@@ -3943,7 +3948,7 @@
table->field[i++]->store(column, col_length, cs);
table->field[i++]->store(priv, priv_length, cs);
table->field[i]->store(is_grantable, strlen(is_grantable), cs);
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
--- 1.133/sql/sql_delete.cc 2004-11-13 18:38:48 +01:00
+++ 1.134/sql/sql_delete.cc 2004-11-18 13:03:44 +01:00
@@ -175,7 +175,7 @@
table->triggers->process_triggers(thd, TRG_EVENT_DELETE,
TRG_ACTION_BEFORE);
- if (!(error=table->file->delete_row(table->record[0])))
+ if (!(error=table->file->execute_delete_row(table->record[0])))
{
deleted++;
if (!--limit && using_limit)
@@ -499,7 +499,7 @@
{
/* If this is the table we are scanning */
table->status|= STATUS_DELETED;
- if (!(error=table->file->delete_row(table->record[0])))
+ if (!(error=table->file->execute_delete_row(table->record[0])))
deleted++;
else if (!table_being_deleted->next_local ||
table_being_deleted->table->file->has_transactions())
@@ -603,7 +603,7 @@
info.ignore_not_found_rows= 1;
while (!(local_error=info.read_record(&info)) && !thd->killed)
{
- if ((local_error=table->file->delete_row(table->record[0])))
+ if ((local_error=table->file->execute_delete_row(table->record[0])))
{
table->file->print_error(local_error,MYF(0));
break;
--- 1.121/sql/sql_insert.cc 2004-11-13 18:35:43 +01:00
+++ 1.122/sql/sql_insert.cc 2004-11-18 13:03:46 +01:00
@@ -677,7 +677,7 @@
if (info->handle_duplicates == DUP_REPLACE ||
info->handle_duplicates == DUP_UPDATE)
{
- while ((error=table->file->write_row(table->record[0])))
+ while ((error=table->file->execute_write_row(table->record[0])))
{
uint key_nr;
if (error != HA_WRITE_SKIP)
@@ -748,7 +748,8 @@
else if (res == VIEW_CHECK_ERROR)
goto err;
- if ((error=table->file->update_row(table->record[1],table->record[0])))
+ if ((error=table->file->execute_update_row(table->record[1],
+ table->record[0])))
goto err;
info->updated++;
break;
@@ -768,13 +769,13 @@
(table->timestamp_field_type == TIMESTAMP_NO_AUTO_SET ||
table->timestamp_field_type == TIMESTAMP_AUTO_SET_ON_BOTH))
{
- if ((error=table->file->update_row(table->record[1],
- table->record[0])))
+ if ((error=table->file->execute_update_row(table->record[1],
+ table->record[0])))
goto err;
info->deleted++;
break; /* Update logfile and count */
}
- else if ((error=table->file->delete_row(table->record[1])))
+ else if ((error=table->file->execute_delete_row(table->record[1])))
goto err;
info->deleted++;
if (!table->file->has_transactions())
@@ -783,7 +784,7 @@
}
info->copied++;
}
- else if ((error=table->file->write_row(table->record[0])))
+ else if ((error=table->file->execute_write_row(table->record[0])))
{
if (info->handle_duplicates != DUP_IGNORE ||
(error != HA_ERR_FOUND_DUPP_KEY && error != HA_ERR_FOUND_DUPP_UNIQUE))
--- 1.251/sql/sql_select.cc 2004-11-15 19:26:54 +01:00
+++ 1.252/sql/sql_select.cc 2004-11-18 13:03:39 +01:00
@@ -8448,11 +8448,11 @@
/* copy all old rows */
while (!table->file->rnd_next(new_table.record[1]))
{
- if ((write_err=new_table.file->write_row(new_table.record[1])))
+ if ((write_err=new_table.file->execute_write_row(new_table.record[1])))
goto err;
}
/* copy row that filled HEAP table */
- if ((write_err=new_table.file->write_row(table->record[0])))
+ if ((write_err=new_table.file->execute_write_row(table->record[0])))
{
if (write_err != HA_ERR_FOUND_DUPP_KEY &&
write_err != HA_ERR_FOUND_DUPP_UNIQUE || !ignore_last_dupp_key_error)
@@ -9717,7 +9717,7 @@
if (!join->having || join->having->val_int())
{
join->found_records++;
- if ((error=table->file->write_row(table->record[0])))
+ if ((error=table->file->execute_write_row(table->record[0])))
{
if (error == HA_ERR_FOUND_DUPP_KEY ||
error == HA_ERR_FOUND_DUPP_UNIQUE)
@@ -9779,8 +9779,8 @@
{ /* Update old record */
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])))
+ if ((error=table->file->execute_update_row(table->record[1],
+ table->record[0])))
{
table->file->print_error(error,MYF(0)); /* purecov: inspected */
DBUG_RETURN(-1); /* purecov: inspected */
@@ -9797,7 +9797,7 @@
init_tmptable_sum_functions(join->sum_funcs);
copy_funcs(join->tmp_table_param.items_to_copy);
- if ((error=table->file->write_row(table->record[0])))
+ if ((error=table->file->execute_write_row(table->record[0])))
{
if (create_myisam_from_heap(join->thd, table, &join->tmp_table_param,
error, 0))
@@ -9832,7 +9832,7 @@
copy_fields(&join->tmp_table_param); // Groups are copied twice.
copy_funcs(join->tmp_table_param.items_to_copy);
- if (!(error=table->file->write_row(table->record[0])))
+ if (!(error=table->file->execute_write_row(table->record[0])))
join->send_records++; // New group
else
{
@@ -9848,8 +9848,8 @@
}
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])))
+ if ((error=table->file->execute_update_row(table->record[1],
+ table->record[0])))
{
table->file->print_error(error,MYF(0)); /* purecov: inspected */
DBUG_RETURN(-1); /* purecov: inspected */
@@ -9891,7 +9891,7 @@
copy_sum_funcs(join->sum_funcs);
if (!join->having || join->having->val_int())
{
- if ((error=table->file->write_row(table->record[0])))
+ if ((error=table->file->execute_write_row(table->record[0])))
{
if (create_myisam_from_heap(join->thd, table,
&join->tmp_table_param,
@@ -10722,7 +10722,7 @@
}
if (having && !having->val_int())
{
- if ((error=file->delete_row(record)))
+ if ((error=file->execute_delete_row(record)))
goto err;
error=file->rnd_next(record);
continue;
@@ -10749,7 +10749,7 @@
}
if (compare_record(table, first_field) == 0)
{
- if ((error=file->delete_row(record)))
+ if ((error=file->execute_delete_row(record)))
goto err;
}
else if (!found)
@@ -10834,7 +10834,7 @@
}
if (having && !having->val_int())
{
- if ((error=file->delete_row(record)))
+ if ((error=file->execute_delete_row(record)))
goto err;
continue;
}
@@ -10850,7 +10850,7 @@
if (hash_search(&hash,key_pos-key_length,key_length))
{
/* Duplicated found ; Remove the row */
- if ((error=file->delete_row(record)))
+ if ((error=file->execute_delete_row(record)))
goto err;
}
else
--- 1.169/sql/sql_show.cc 2004-11-16 22:04:48 +01:00
+++ 1.170/sql/sql_show.cc 2004-11-18 13:03:47 +01:00
@@ -1984,7 +1984,7 @@
DBUG_ASSERT(0);
}
}
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
else
{
@@ -2053,7 +2053,7 @@
table->field[2]->store(create.default_table_charset->csname,
strlen(create.default_table_charset->csname),
system_charset_info);
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
}
return 0;
@@ -2203,7 +2203,7 @@
if (comment != show_table->comment)
my_free(comment,MYF(0));
}
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
DBUG_RETURN(0);
}
@@ -2337,7 +2337,7 @@
#endif
table->field[17]->store(tmp+1,end == tmp ? 0 : (uint) (end-tmp-1), cs);
table->field[18]->store(field->comment.str, field->comment.length, cs);
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
}
DBUG_RETURN(0);
@@ -2366,7 +2366,7 @@
scs);
table->field[2]->store(tmp_cs->name, strlen(tmp_cs->name), scs);
table->field[3]->store((longlong) tmp_cs->mbmaxlen);
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
}
return 0;
@@ -2405,7 +2405,7 @@
tmp_buff= (tmp_cl->state & MY_CS_COMPILED)? "Yes" : "";
table->field[4]->store(tmp_buff, strlen(tmp_buff), scs);
table->field[5]->store((longlong) tmp_cl->strxfrm_multiply);
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
}
}
@@ -2435,7 +2435,7 @@
restore_record(table, default_values);
table->field[0]->store(tmp_cl->name, strlen(tmp_cl->name), scs);
table->field[1]->store(tmp_cl->csname , strlen(tmp_cl->csname), scs);
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
}
return 0;
@@ -2502,7 +2502,7 @@
table->field[17]->store(tmp_string.ptr(), tmp_string.length(), cs);
table->field[7]->store("SQL", 3, cs);
table->field[9]->store("SQL", 3, cs);
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
}
}
@@ -2606,7 +2606,7 @@
else
table->field[14]->store("", 0, cs);
table->field[14]->set_notnull();
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
}
}
@@ -2644,7 +2644,7 @@
table->field[5]->store("YES", 3, cs);
else
table->field[5]->store("NO", 2, cs);
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
}
DBUG_RETURN(res);
@@ -2680,7 +2680,7 @@
table->field[5]->store("PRIMARY KEY", 11, cs);
else if (key_info->flags & HA_NOSAME)
table->field[5]->store("UNIQUE", 6, cs);
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
show_table->file->get_foreign_key_list(thd, &f_key_list);
@@ -2698,7 +2698,7 @@
table->field[6]->store(f_key_info->constraint_method->str,
f_key_info->constraint_method->length, cs);
table->field[6]->set_notnull();
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
}
DBUG_RETURN(res);
@@ -2742,7 +2742,7 @@
table->field[5]->store(key_part->field->field_name,
strlen(key_part->field->field_name), cs);
table->field[6]->store((longlong) f_idx);
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
}
}
@@ -2776,7 +2776,7 @@
table->field[8]->set_notnull();
table->field[9]->store(r_info->str, r_info->length, cs);
table->field[9]->set_notnull();
- table->file->write_row(table->record[0]);
+ table->file->execute_write_row(table->record[0]);
}
}
}
--- 1.197/sql/sql_table.cc 2004-11-13 18:38:49 +01:00
+++ 1.198/sql/sql_table.cc 2004-11-18 13:03:38 +01:00
@@ -3431,7 +3431,7 @@
{
copy_ptr->do_copy(copy_ptr);
}
- if ((error=to->file->write_row((byte*) to->record[0])))
+ if ((error=to->file->execute_write_row((byte*) to->record[0])))
{
if ((handle_duplicates != DUP_IGNORE &&
handle_duplicates != DUP_REPLACE) ||
--- 1.39/sql/sql_udf.cc 2004-11-13 18:35:44 +01:00
+++ 1.40/sql/sql_udf.cc 2004-11-18 13:03:42 +01:00
@@ -440,7 +440,7 @@
table->field[2]->store(u_d->dl,(uint) strlen(u_d->dl), system_charset_info);
if (table->fields >= 4) // If not old func format
table->field[3]->store((longlong) u_d->type);
- error = table->file->write_row(table->record[0]);
+ error = table->file->execute_write_row(table->record[0]);
close_thread_tables(thd);
if (error)
@@ -496,7 +496,7 @@
HA_READ_KEY_EXACT))
{
int error;
- if ((error = table->file->delete_row(table->record[0])))
+ if ((error = table->file->execute_delete_row(table->record[0])))
table->file->print_error(error, MYF(0));
}
close_thread_tables(thd);
--- 1.128/sql/sql_update.cc 2004-11-13 18:35:44 +01:00
+++ 1.129/sql/sql_update.cc 2004-11-18 13:03:45 +01:00
@@ -384,8 +384,8 @@
break;
}
}
- if (!(error=table->file->update_row((byte*) table->record[1],
- (byte*) table->record[0])))
+ if (!(error=table->file->execute_update_row((byte*) table->record[1],
+ (byte*) table->record[0])))
{
updated++;
thd->no_trans_update= !transactional_table;
@@ -1115,8 +1115,8 @@
*/
main_table->file->extra(HA_EXTRA_PREPARE_FOR_UPDATE);
}
- if ((error=table->file->update_row(table->record[1],
- table->record[0])))
+ if ((error=table->file->execute_update_row(table->record[1],
+ table->record[0])))
{
updated--;
if (handle_duplicates != DUP_IGNORE ||
@@ -1141,7 +1141,7 @@
memcpy((char*) tmp_table->field[0]->ptr,
(char*) table->file->ref, table->file->ref_length);
/* Write row, ignoring duplicated updates to a row */
- if ((error= tmp_table->file->write_row(tmp_table->record[0])) &&
+ if ((error= tmp_table->file->execute_write_row(tmp_table->record[0])) &&
(error != HA_ERR_FOUND_DUPP_KEY &&
error != HA_ERR_FOUND_DUPP_UNIQUE))
{
@@ -1251,8 +1251,8 @@
if (compare_record(table, thd->query_id))
{
- if ((local_error=table->file->update_row(table->record[1],
- table->record[0])))
+ if ((local_error=table->file->execute_update_row(table->record[1],
+ table->record[0])))
{
if (local_error != HA_ERR_FOUND_DUPP_KEY ||
handle_duplicates != DUP_IGNORE)
--- 1.62/sql/sp.cc 2004-11-13 18:35:43 +01:00
+++ 1.63/sql/sp.cc 2004-11-18 13:03:43 +01:00
@@ -406,7 +406,7 @@
system_charset_info);
ret= SP_OK;
- if (table->file->write_row(table->record[0]))
+ if (table->file->execute_write_row(table->record[0]))
ret= SP_WRITE_ROW_FAILED;
}
@@ -431,7 +431,7 @@
ret= db_find_routine_aux(thd, type, name, TL_WRITE, &table, &opened);
if (ret == SP_OK)
{
- if (table->file->delete_row(table->record[0]))
+ if (table->file->execute_delete_row(table->record[0]))
ret= SP_DELETE_ROW_FAILED;
}
@@ -467,7 +467,7 @@
table->field[MYSQL_PROC_FIELD_COMMENT]->store(chistics->comment.str,
chistics->comment.length,
system_charset_info);
- if ((table->file->update_row(table->record[1],table->record[0])))
+ if ((table->file->execute_update_row(table->record[1],table->record[0])))
ret= SP_WRITE_ROW_FAILED;
}
if (opened)
@@ -691,7 +691,7 @@
bool deleted= FALSE;
do {
- if (! table->file->delete_row(table->record[0]))
+ if (! table->file->execute_delete_row(table->record[0]))
deleted= TRUE; /* We deleted something */
else
{
| Thread |
|---|
| • bk commit into 5.0 tree (mats:1.1654) | Mats Kindahl | 18 Nov |
