Bug #30355485 CRASH WHEN DOING ANY OPERATION ON SUB-PARTITIONED TABLE

PROBLEM
--------
Removing the ibd file manually after table creation and trying to
do a select on the partitioned table after restart caused a debug crash.
The debug crash is because we are not cleaning the ha_innopart handle
properly in the error path. (when we detect ibd file is missing).In this
case it is complaining that bit map allocated for the ha_innopart handler
is not freed.

FIX
---
Properly clear the ha_innopart handler in the error path.

RB: 23542
Reviewed-by: Kevin Lewis <[email protected]>

Author: Aditya A

mysql-test/r/partition_debug.result

@@ -14,3 +14,15 @@ SELECT * FROM t1 WHERE b = "Seven";
 a	b
 7	Seven
 DROP TABLE t1;
+#
+# Bug #30355485	CRASH WHEN DOING ANY OPERATION ON SUB-PARTITIONED TABLE
+#
+CREATE TABLE t1 (a INT, b INT) ENGINE = INNODB
+PARTITION BY RANGE(a) SUBPARTITION BY HASH(b)
+( PARTITION p0 VALUES LESS THAN (10) (SUBPARTITION s0, SUBPARTITION s1));
+# Shut down the server
+# Removing test/t1#P#p0#SP#s0.ibd manually
+# restart
+SELECT * FROM t1;
+ERROR 42S02: Table 'test.t1' doesn't exist
+DROP TABLE t1;

mysql-test/t/partition_debug.test

@@ -17,3 +17,35 @@ SELECT * FROM t1 WHERE b = "Seven";
 SET SESSION debug="-d,partition_fail_index_init";
 SELECT * FROM t1 WHERE b = "Seven";
 DROP TABLE t1;
+
+
+--echo #
+--echo # Bug #30355485	CRASH WHEN DOING ANY OPERATION ON SUB-PARTITIONED TABLE
+--echo #
+
+--let $MYSQLD_DATADIR= `select @@datadir`
+CREATE TABLE t1 (a INT, b INT) ENGINE = INNODB
+PARTITION BY RANGE(a) SUBPARTITION BY HASH(b)
+( PARTITION p0 VALUES LESS THAN (10) (SUBPARTITION s0, SUBPARTITION s1));
+
+--disable_query_log
+call mtr.add_suppression("InnoDB: Operating system error number 2 in a file operation");
+call mtr.add_suppression("InnoDB: The error means the system cannot find the path specified");
+call mtr.add_suppression("InnoDB: Cannot open datafile for read-only:");
+call mtr.add_suppression("InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them");
+call mtr.add_suppression("InnoDB: Could not find a valid tablespace file for");
+call mtr.add_suppression("InnoDB: Ignoring tablespace");
+call mtr.add_suppression("InnoDB: Failed to find tablespace for table");
+call mtr.add_suppression("InnoDB: Cannot calculate statistics for table");
+call mtr.add_suppression("InnoDB: Missing .ibd file for table");
+--enable_query_log
+
+--echo # Shut down the server
+--source include/shutdown_mysqld.inc
+--echo # Removing test/t1#P#p0#SP#s0.ibd manually
+--remove_file $MYSQLD_DATADIR/test/t1#P#p0#SP#s0.ibd
+--source include/start_mysqld.inc
+
+--error ER_NO_SUCH_TABLE
+SELECT * FROM t1;
+DROP TABLE t1;

storage/innobase/handler/ha_innopart.cc

@@ -1113,12 +1113,7 @@ ha_innopart::open(
 
 	if (!thd_tablespace_op(thd) && no_tablespace) {
                 set_my_errno(ENOENT);
-
-		lock_shared_ha_data();
-		m_part_share->close_table_parts();
-		unlock_shared_ha_data();
-		m_part_share = NULL;
-
+		close();
 		DBUG_RETURN(HA_ERR_NO_SUCH_TABLE);
 	}
 
@@ -1461,8 +1456,10 @@ ha_innopart::close()
 
 	/* Prevent double close of m_prebuilt->table. The real one was done
 	done in m_part_share->close_table_parts(). */
-	m_prebuilt->table = NULL;
-	row_prebuilt_free(m_prebuilt, FALSE);
+	if (m_prebuilt != NULL) {
+		m_prebuilt->table = NULL;
+		row_prebuilt_free(m_prebuilt, FALSE);
+        }
 
 	if (m_upd_buf != NULL) {
 		ut_ad(m_upd_buf_size != 0);