Merge 10.0 into 10.1

dr-m · dr-m · commit ecd3a7e00de2 · 2018-12-07T13:17:32.000+02:00
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -11015,10 +11015,6 @@ create_table_def(
 			 : ER_TABLESPACE_EXISTS, MYF(0), display_name);
 	}
 
-	if (err == DB_SUCCESS && (flags2 & DICT_TF2_FTS)) {
-		fts_optimize_add_table(table);
-	}
-
 error_ret:
 	DBUG_RETURN(convert_error_code_to_mysql(err, flags, thd));
 }
@@ -12296,6 +12292,10 @@ ha_innobase::create(
 			trx_free_for_mysql(trx);
 			DBUG_RETURN(-1);
 		}
+
+		mutex_enter(&dict_sys->mutex);
+		fts_optimize_add_table(innobase_table);
+		mutex_exit(&dict_sys->mutex);
 	}
 
 	/* Note: We can't call update_thd() as prebuilt will not be
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
@@ -11584,10 +11584,6 @@ create_table_def(
 			 : ER_TABLESPACE_EXISTS, MYF(0), display_name);
 	}
 
-	if (err == DB_SUCCESS && (flags2 & DICT_TF2_FTS)) {
-		fts_optimize_add_table(table);
-	}
-
 error_ret:
 	DBUG_RETURN(convert_error_code_to_mysql(err, flags, thd));
 }
@@ -12869,6 +12865,10 @@ ha_innobase::create(
 			trx_free_for_mysql(trx);
 			DBUG_RETURN(-1);
 		}
+
+		mutex_enter(&dict_sys->mutex);
+		fts_optimize_add_table(innobase_table);
+		mutex_exit(&dict_sys->mutex);
 	}
 
 	/* Note: We can't call update_thd() as prebuilt will not be

Original file line number	Diff line number	Diff line change
`@@ -11015,10 +11015,6 @@ create_table_def(`
`11015`	`11015`	`: ER_TABLESPACE_EXISTS, MYF(0), display_name);`
`11016`	`11016`	`}`
`11017`	`11017`
`11018`		`- if (err == DB_SUCCESS && (flags2 & DICT_TF2_FTS)) {`
`11019`		`- fts_optimize_add_table(table);`
`11020`		`- }`
`11021`		`-`
`11022`	`11018`	`error_ret:`
`11023`	`11019`	`DBUG_RETURN(convert_error_code_to_mysql(err, flags, thd));`
`11024`	`11020`	`}`
`@@ -12296,6 +12292,10 @@ ha_innobase::create(`
`12296`	`12292`	`trx_free_for_mysql(trx);`
`12297`	`12293`	`DBUG_RETURN(-1);`
`12298`	`12294`	`}`
	`12295`	`+`
	`12296`	`+ mutex_enter(&dict_sys->mutex);`
	`12297`	`+ fts_optimize_add_table(innobase_table);`
	`12298`	`+ mutex_exit(&dict_sys->mutex);`
`12299`	`12299`	`}`
`12300`	`12300`
`12301`	`12301`	`/* Note: We can't call update_thd() as prebuilt will not be`
Original file line number	Diff line number	Diff line change
`@@ -11584,10 +11584,6 @@ create_table_def(`
`11584`	`11584`	`: ER_TABLESPACE_EXISTS, MYF(0), display_name);`
`11585`	`11585`	`}`
`11586`	`11586`
`11587`		`- if (err == DB_SUCCESS && (flags2 & DICT_TF2_FTS)) {`
`11588`		`- fts_optimize_add_table(table);`
`11589`		`- }`
`11590`		`-`
`11591`	`11587`	`error_ret:`
`11592`	`11588`	`DBUG_RETURN(convert_error_code_to_mysql(err, flags, thd));`
`11593`	`11589`	`}`
`@@ -12869,6 +12865,10 @@ ha_innobase::create(`
`12869`	`12865`	`trx_free_for_mysql(trx);`
`12870`	`12866`	`DBUG_RETURN(-1);`
`12871`	`12867`	`}`
	`12868`	`+`
	`12869`	`+ mutex_enter(&dict_sys->mutex);`
	`12870`	`+ fts_optimize_add_table(innobase_table);`
	`12871`	`+ mutex_exit(&dict_sys->mutex);`
`12872`	`12872`	`}`
`12873`	`12873`
`12874`	`12874`	`/* Note: We can't call update_thd() as prebuilt will not be`