handler: ensure that nobody makes a row operation not from table->file

MariaDB · May 8, 2023 · f221bc4 · f221bc4
1 parent 266aa7a
commit f221bc4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -7749,6 +7749,7 @@ ha_innobase::write_row(
 	bool		auto_inc_used = false;
 
 	DBUG_ENTER("ha_innobase::write_row");
+  DBUG_ASSERT(table->file == this || dynamic_cast<ha_innobase*>(table->file) == NULL);
 
 	trx_t*		trx = thd_to_trx(m_user_thd);
 
@@ -8479,6 +8480,7 @@ ha_innobase::update_row(
 
 	DBUG_ENTER("ha_innobase::update_row");
 
+  DBUG_ASSERT(table->file == this || dynamic_cast<ha_innobase*>(table->file) == NULL);
 	if (is_read_only()) {
 		DBUG_RETURN(HA_ERR_TABLE_READONLY);
 	} else if (!trx_is_started(trx)) {
@@ -8653,6 +8655,8 @@ ha_innobase::delete_row(
 
 	DBUG_ENTER("ha_innobase::delete_row");
 
+  DBUG_ASSERT(table->file == this || dynamic_cast<ha_innobase*>(table->file) == NULL);
+
 	if (is_read_only()) {
 		DBUG_RETURN(HA_ERR_TABLE_READONLY);
 	} else if (!trx_is_started(trx)) {

diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc
@@ -983,6 +983,8 @@ int ha_myisam::close(void)
 
 int ha_myisam::write_row(const uchar *buf)
 {
+
+  DBUG_ASSERT(table->file == this || dynamic_cast<ha_myisam*>(table->file) == NULL);
   /*
     If we have an auto_increment column and we are writing a changed row
     or a new row, then update the auto_increment value in the record.
@@ -1957,11 +1959,15 @@ bool ha_myisam::is_crashed() const
 
 int ha_myisam::update_row(const uchar *old_data, const uchar *new_data)
 {
+
+  DBUG_ASSERT(table->file == this || dynamic_cast<ha_myisam*>(table->file) == NULL);
   return mi_update(file,old_data,new_data);
 }
 
 int ha_myisam::delete_row(const uchar *buf)
 {
+
+  DBUG_ASSERT(table->file == this || dynamic_cast<ha_myisam*>(table->file) == NULL);
   return mi_delete(file,buf);
 }