Commit ffa37894 authored by Marko Mäkelä's avatar Marko Mäkelä

Follow-up to MDEV-11487: Remove InnoDB internal temporary tables

row_update_for_mysql(): Remove the wrapper function and
rename the function from row_update_for_mysql_using_upd_graph().
Remove the unused parameter mysql_rec.
parent c3f9fdea
...@@ -9417,7 +9417,7 @@ ha_innobase::update_row( ...@@ -9417,7 +9417,7 @@ ha_innobase::update_row(
innobase_srv_conc_enter_innodb(m_prebuilt); innobase_srv_conc_enter_innodb(m_prebuilt);
error = row_update_for_mysql((byte*) old_row, m_prebuilt); error = row_update_for_mysql(m_prebuilt);
if (error == DB_SUCCESS && autoinc) { if (error == DB_SUCCESS && autoinc) {
/* A value for an AUTO_INCREMENT column /* A value for an AUTO_INCREMENT column
...@@ -9532,7 +9532,7 @@ ha_innobase::delete_row( ...@@ -9532,7 +9532,7 @@ ha_innobase::delete_row(
innobase_srv_conc_enter_innodb(m_prebuilt); innobase_srv_conc_enter_innodb(m_prebuilt);
error = row_update_for_mysql((byte*) record, m_prebuilt); error = row_update_for_mysql(m_prebuilt);
innobase_srv_conc_exit_innodb(m_prebuilt); innobase_srv_conc_exit_innodb(m_prebuilt);
......
...@@ -272,13 +272,10 @@ row_table_got_default_clust_index( ...@@ -272,13 +272,10 @@ row_table_got_default_clust_index(
const dict_table_t* table); /*!< in: table */ const dict_table_t* table); /*!< in: table */
/** Does an update or delete of a row for MySQL. /** Does an update or delete of a row for MySQL.
@param[in] mysql_rec row in the MySQL format
@param[in,out] prebuilt prebuilt struct in MySQL handle @param[in,out] prebuilt prebuilt struct in MySQL handle
@return error code or DB_SUCCESS */ @return error code or DB_SUCCESS */
dberr_t dberr_t
row_update_for_mysql( row_update_for_mysql(row_prebuilt_t* prebuilt)
const byte* mysql_rec,
row_prebuilt_t* prebuilt)
MY_ATTRIBUTE((warn_unused_result)); MY_ATTRIBUTE((warn_unused_result));
/** This can only be used when srv_locks_unsafe_for_binlog is TRUE or this /** This can only be used when srv_locks_unsafe_for_binlog is TRUE or this
......
...@@ -1811,14 +1811,10 @@ class ib_dec_counter { ...@@ -1811,14 +1811,10 @@ class ib_dec_counter {
/** Does an update or delete of a row for MySQL. /** Does an update or delete of a row for MySQL.
@param[in] mysql_rec row in the MySQL format
@param[in,out] prebuilt prebuilt struct in MySQL handle @param[in,out] prebuilt prebuilt struct in MySQL handle
@return error code or DB_SUCCESS */ @return error code or DB_SUCCESS */
static
dberr_t dberr_t
row_update_for_mysql_using_upd_graph( row_update_for_mysql(row_prebuilt_t* prebuilt)
const byte* mysql_rec,
row_prebuilt_t* prebuilt)
{ {
trx_savept_t savept; trx_savept_t savept;
dberr_t err; dberr_t err;
...@@ -1834,13 +1830,13 @@ row_update_for_mysql_using_upd_graph( ...@@ -1834,13 +1830,13 @@ row_update_for_mysql_using_upd_graph(
upd_cascade_t* processed_cascades; upd_cascade_t* processed_cascades;
bool got_s_lock = false; bool got_s_lock = false;
DBUG_ENTER("row_update_for_mysql_using_upd_graph"); DBUG_ENTER("row_update_for_mysql");
ut_ad(trx); ut_ad(trx);
ut_a(prebuilt->magic_n == ROW_PREBUILT_ALLOCATED); ut_a(prebuilt->magic_n == ROW_PREBUILT_ALLOCATED);
ut_a(prebuilt->magic_n2 == ROW_PREBUILT_ALLOCATED); ut_a(prebuilt->magic_n2 == ROW_PREBUILT_ALLOCATED);
ut_a(prebuilt->template_type == ROW_MYSQL_WHOLE_ROW);
ut_ad(table->stat_initialized); ut_ad(table->stat_initialized);
UT_NOT_USED(mysql_rec);
if (!table->is_readable()) { if (!table->is_readable()) {
return(row_mysql_get_table_status(table, trx, true)); return(row_mysql_get_table_status(table, trx, true));
...@@ -2157,19 +2153,6 @@ row_update_for_mysql_using_upd_graph( ...@@ -2157,19 +2153,6 @@ row_update_for_mysql_using_upd_graph(
DBUG_RETURN(err); DBUG_RETURN(err);
} }
/** Does an update or delete of a row for MySQL.
@param[in] mysql_rec row in the MySQL format
@param[in,out] prebuilt prebuilt struct in MySQL handle
@return error code or DB_SUCCESS */
dberr_t
row_update_for_mysql(
const byte* mysql_rec,
row_prebuilt_t* prebuilt)
{
ut_a(prebuilt->template_type == ROW_MYSQL_WHOLE_ROW);
return(row_update_for_mysql_using_upd_graph(mysql_rec, prebuilt));
}
/** This can only be used when srv_locks_unsafe_for_binlog is TRUE or this /** This can only be used when srv_locks_unsafe_for_binlog is TRUE or this
session is using a READ COMMITTED or READ UNCOMMITTED isolation level. session is using a READ COMMITTED or READ UNCOMMITTED isolation level.
Before calling this function row_search_for_mysql() must have Before calling this function row_search_for_mysql() must have
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment