Bug #22306581 VALGRIND FAILURE IN INNODB.TEMPORARY_TABLE

	- Post push fix to address kevin's review comments.

Author: Thirunarayanan

mysql-test/suite/innodb/r/create_table.result

@@ -1,7 +1,11 @@
 #
 # Bug #22306581	VALGRIND FAILURE IN INNODB.TEMPORARY_TABLE
 #
-create temporary table t (i int)COMPRESSION = "ZLIB" ENGINE = InnoDB;
+create temporary table t (i int) COMPRESSION = "ZLIB" ENGINE = InnoDB;
 ERROR 42000: Table 't' uses an extension that doesn't exist in this MySQL version
-create table t1(i INT)COMPRESSION="ZLIB" ENGINE=InnoDB TABLESPACE=innodb_system;
+create table t1(i INT) COMPRESSION="ZLIB" ENGINE=InnoDB TABLESPACE=innodb_system;
 ERROR 42000: Table 't1' uses an extension that doesn't exist in this MySQL version
+SET DEBUG ='+d, simulate_max_char_col';
+create table t1(f1 varchar(1000))engine=innodb;
+ERROR HY000: Got error 1005 from storage engine
+SET DEBUG ='-d, simulate_max_char_col';

mysql-test/suite/innodb/t/create_table.test

@@ -1,9 +1,17 @@
+--source include/have_innodb.inc
+--source include/have_debug.inc
+
 --echo #
 --echo # Bug #22306581	VALGRIND FAILURE IN INNODB.TEMPORARY_TABLE
 --echo #
 
 --error ER_UNSUPPORTED_EXTENSION
-create temporary table t (i int)COMPRESSION = "ZLIB" ENGINE = InnoDB;
+create temporary table t (i int) COMPRESSION = "ZLIB" ENGINE = InnoDB;
 
 --error ER_UNSUPPORTED_EXTENSION
-create table t1(i INT)COMPRESSION="ZLIB" ENGINE=InnoDB TABLESPACE=innodb_system;
+create table t1(i INT) COMPRESSION="ZLIB" ENGINE=InnoDB TABLESPACE=innodb_system;
+
+SET DEBUG ='+d, simulate_max_char_col';
+--error 1030
+create table t1(f1 varchar(1000))engine=innodb;
+SET DEBUG ='-d, simulate_max_char_col';

storage/innobase/handler/ha_innodb.cc

@@ -9591,12 +9591,13 @@ create_table_info_t::create_table_def()
 		}
 	}
 
+	ut_ad(trx_state_eq(m_trx, TRX_STATE_NOT_STARTED));
+
 	/* Check whether there already exists a FTS_DOC_ID column */
 	if (create_table_check_doc_id_col(m_trx, m_form, &doc_id_col)){
 
 		/* Raise error if the Doc ID column is of wrong type or name */
 		if (doc_id_col == ULINT_UNDEFINED) {
-			trx_commit_for_mysql(m_trx);
 
 			err = DB_ERROR;
 			goto error_ret;
@@ -9701,6 +9702,10 @@ create_table_info_t::create_table_def()
 
 			charset_no = (ulint) field->charset()->number;
 
+			DBUG_EXECUTE_IF("simulate_max_char_col",
+					charset_no = MAX_CHAR_COLL_NUM + 1;
+					);
+
 			if (charset_no > MAX_CHAR_COLL_NUM) {
 				/* in data0type.h we assume that the
 				number fits in one byte in prtype */
@@ -9712,6 +9717,11 @@ create_table_info_t::create_table_def()
 					" Unsupported code %lu.",
 					(ulong) charset_no);
 				mem_heap_free(heap);
+				dict_mem_table_free(table);
+
+				ut_ad(trx_state_eq(
+					m_trx, TRX_STATE_NOT_STARTED));
+
 				DBUG_RETURN(ER_CANT_CREATE_TABLE);
 			}
 		}
@@ -9747,7 +9757,7 @@ create_table_info_t::create_table_def()
 err_col:
 			dict_mem_table_free(table);
 			mem_heap_free(heap);
-			trx_commit_for_mysql(m_trx);
+			ut_ad(trx_state_eq(m_trx, TRX_STATE_NOT_STARTED));
 
 			err = DB_ERROR;
 			goto error_ret;
@@ -9799,6 +9809,8 @@ create_table_info_t::create_table_def()
 		fts_add_doc_id_column(table, heap);
 	}
 
+	ut_ad(trx_state_eq(m_trx, TRX_STATE_NOT_STARTED));
+
 	/* If temp table, then we avoid creation of entries in SYSTEM TABLES.
 	Given that temp table lifetime is limited to connection/server lifetime
 	on re-start we don't need to restore temp-table and so no entry is
@@ -9816,7 +9828,6 @@ create_table_info_t::create_table_def()
 
 			err = DB_UNSUPPORTED;
 			dict_mem_table_free(table);
-
 		} else {
 
 			/* Get a new table ID */