- Addressed ASAN failure

mysql-test/suite/innodb_gis/r/rtree_concurrent_srch.result

@@ -328,6 +328,7 @@ connection default;
 DROP TABLE t1;
 SET DEBUG_SYNC = 'RESET';
 create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb;
+insert into t1 values(100, point(100, 100));
 create procedure insert_t1(IN total int)
 begin
 declare i int default 1;
@@ -348,7 +349,7 @@ rollback;
 SET DEBUG_SYNC= 'now SIGNAL sigb';
 connection a;
 count(*)
-0
+1
 connection default;
 drop procedure insert_t1;
 DROP TABLE t1;

mysql-test/suite/innodb_gis/t/rtree_concurrent_srch.test

@@ -388,6 +388,7 @@ DROP TABLE t1;
 SET DEBUG_SYNC = 'RESET';
 
 create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb;
+insert into t1 values(100, point(100, 100));
 
 delimiter |;
 create procedure insert_t1(IN total int)

storage/innobase/row/row0merge.cc

@@ -1733,23 +1733,6 @@ row_merge_read_clustered_index(
 	DEBUG_FTS_SORT_PRINT("FTS_SORT: Start Create Index\n");
 #endif
 
-	/* Create and initialize memory for record buffers */
-
-	merge_buf = static_cast<row_merge_buf_t**>(
-		ut_malloc_nokey(n_index * sizeof *merge_buf));
-
-	row_merge_dup_t	clust_dup = {index[0], table, col_map, 0};
-	dfield_t*	prev_fields;
-	const ulint	n_uniq = dict_index_get_n_unique(index[0]);
-
-	ut_ad(trx->mysql_thd != NULL);
-
-	const char*	path = thd_innodb_tmpdir(trx->mysql_thd);
-
-	ut_ad(!skip_pk_sort || dict_index_is_clust(index[0]));
-	/* There is no previous tuple yet. */
-	prev_mtuple.fields = NULL;
-
 	/* Check early (without accessing index pages) if the table is empty.
 
 	If we read bulk_trx_id as an older transaction ID,
@@ -1767,6 +1750,23 @@ row_merge_read_clustered_index(
 		}
 	}
 
+	/* Create and initialize memory for record buffers */
+
+	merge_buf = static_cast<row_merge_buf_t**>(
+		ut_malloc_nokey(n_index * sizeof *merge_buf));
+
+	row_merge_dup_t	clust_dup = {index[0], table, col_map, 0};
+	dfield_t*	prev_fields;
+	const ulint	n_uniq = dict_index_get_n_unique(index[0]);
+
+	ut_ad(trx->mysql_thd != NULL);
+
+	const char*	path = thd_innodb_tmpdir(trx->mysql_thd);
+
+	ut_ad(!skip_pk_sort || dict_index_is_clust(index[0]));
+	/* There is no previous tuple yet. */
+	prev_mtuple.fields = NULL;
+
 	/* Note: we must recheck old_table->bulk_trx_id after we have
 	acquired the page latch on the clustered index root page or
 	the leftmost leaf page. */