Merge branch 'mysql-5.6' into mysql-5.7

Author: Shaohua Wang

storage/innobase/fts/fts0fts.cc

@@ -213,13 +213,15 @@ FTS auxiliary INDEX table and clear the cache at the end.
 @param[in,out]	sync		sync state
 @param[in]	unlock_cache	whether unlock cache lock when write node
 @param[in]	wait		whether wait when a sync is in progress
+@param[in]	background	whether sync in background
 @return DB_SUCCESS if all OK */
 static
 dberr_t
 fts_sync(
 	fts_sync_t*	sync,
 	bool		unlock_cache,
-	bool		wait);
+	bool		wait,
+	bool		background);
 
 /****************************************************************//**
 Release all resources help by the words rb tree e.g., the node ilist. */
@@ -1032,15 +1034,16 @@ fts_words_free(
 	}
 }
 
-/*********************************************************************//**
-Clear cache. */
+/** Clear cache.
+@param[in,out]	cache	fts cache */
 void
 fts_cache_clear(
-/*============*/
-	fts_cache_t*	cache)		/*!< in: cache */
+	fts_cache_t*	cache)
 {
 	ulint		i;
 
+	rw_lock_x_lock(&cache->init_lock);
+
 	for (i = 0; i < ib_vector_size(cache->indexes); ++i) {
 		ulint			j;
 		fts_index_cache_t*	index_cache;
@@ -1078,6 +1081,8 @@ fts_cache_clear(
 		index_cache->doc_stats = NULL;
 	}
 
+	rw_lock_x_unlock(&cache->init_lock);
+
 	mem_heap_free(static_cast<mem_heap_t*>(cache->sync_heap->arg));
 	cache->sync_heap->arg = NULL;
 
@@ -3647,7 +3652,7 @@ fts_add_doc_by_id(
 
 				DBUG_EXECUTE_IF(
 					"fts_instrument_sync_debug",
-					fts_sync(cache->sync, true, true);
+					fts_sync(cache->sync, true, true, false);
 				);
 
 				DEBUG_SYNC_C("fts_instrument_sync_request");
@@ -4567,6 +4572,8 @@ fts_sync_rollback(
 	trx_t*		trx = sync->trx;
 	fts_cache_t*	cache = sync->table->fts->cache;
 
+	rw_lock_x_lock(&cache->init_lock);
+
 	for (ulint i = 0; i < ib_vector_size(cache->indexes); ++i) {
 		ulint			j;
 		fts_index_cache_t*	index_cache;
@@ -4596,6 +4603,7 @@ fts_sync_rollback(
 		}
 	}
 
+	rw_lock_x_unlock(&cache->init_lock);
 	rw_lock_x_unlock(&cache->lock);
 
 	fts_sql_rollback(trx);
@@ -4607,18 +4615,23 @@ FTS auxiliary INDEX table and clear the cache at the end.
 @param[in,out]	sync		sync state
 @param[in]	unlock_cache	whether unlock cache lock when write node
 @param[in]	wait		whether wait when a sync is in progress
+@param[in]	has_dict	whether has dict operation lock, if true,
+				unlock it before return.
 @return DB_SUCCESS if all OK */
 static
 dberr_t
 fts_sync(
 	fts_sync_t*	sync,
 	bool		unlock_cache,
-	bool		wait)
+	bool		wait,
+	bool		has_dict)
 {
 	ulint		i;
 	dberr_t		error = DB_SUCCESS;
 	fts_cache_t*	cache = sync->table->fts->cache;
 
+	ut_ad(!(has_dict & wait));
+
 	rw_lock_x_lock(&cache->lock);
 
 	/* Check if cache is being synced.
@@ -4630,6 +4643,10 @@ fts_sync(
 		if (wait) {
 			os_event_wait(sync->event);
 		} else {
+			if (has_dict) {
+				rw_lock_s_unlock(dict_operation_lock);
+			}
+
 			return(DB_SUCCESS);
 		}
 
@@ -4688,7 +4705,15 @@ fts_sync(
 end_sync:
 	if (error == DB_SUCCESS && !sync->interrupted) {
 		error = fts_sync_commit(sync);
+
+		if (has_dict) {
+			rw_lock_s_unlock(dict_operation_lock);
+		}
 	} else {
+		if (has_dict) {
+			rw_lock_s_unlock(dict_operation_lock);
+		}
+
 		fts_sync_rollback(sync);
 	}
 
@@ -4716,20 +4741,26 @@ FTS auxiliary INDEX table and clear the cache at the end.
 @param[in,out]	table		fts table
 @param[in]	unlock_cache	whether unlock cache when write node
 @param[in]	wait		whether wait for existing sync to finish
+@param[in]	has_dict	whether has dict operation lock, if true
+				unlock it before return
 @return DB_SUCCESS on success, error code on failure. */
 dberr_t
 fts_sync_table(
 	dict_table_t*	table,
 	bool		unlock_cache,
-	bool		wait)
+	bool		wait,
+	bool		has_dict)
 {
 	dberr_t	err = DB_SUCCESS;
 
 	ut_ad(table->fts);
 
 	if (!dict_table_is_discarded(table) && table->fts->cache
 	    && !dict_table_is_corrupted(table)) {
-		err = fts_sync(table->fts->cache->sync, unlock_cache, wait);
+		err = fts_sync(
+			table->fts->cache->sync, unlock_cache, wait, has_dict);
+	} else if (has_dict) {
+			rw_lock_s_unlock(dict_operation_lock);
 	}
 
 	return(err);

storage/innobase/fts/fts0opt.cc

@@ -2958,15 +2958,29 @@ fts_optimize_sync_table(
 {
 	dict_table_t*   table = NULL;
 
+	/* Prevent DROP INDEX etc. from running when we are syncing
+	cache in background. */
+	if (!rw_lock_s_lock_nowait(dict_operation_lock, __FILE__, __LINE__)) {
+		/* Exit when fail to get dict operation lock. */
+		return;
+	}
+
+	bool	has_dict_lock = true;
+
 	table = dict_table_open_on_id(table_id, FALSE, DICT_TABLE_OP_NORMAL);
 
 	if (table) {
 		if (dict_table_has_fts_index(table) && table->fts->cache) {
-			fts_sync_table(table, true, false);
+			fts_sync_table(table, true, false, true);
+			has_dict_lock = false;
 		}
 
 		dict_table_close(table, FALSE, FALSE);
 	}
+
+	if (has_dict_lock) {
+		rw_lock_s_unlock(dict_operation_lock);
+	}
 }
 
 /**********************************************************************//**

storage/innobase/handler/ha_innodb.cc

@@ -14241,7 +14241,7 @@ ha_innobase::optimize(
 	if (innodb_optimize_fulltext_only) {
 		if (m_prebuilt->table->fts && m_prebuilt->table->fts->cache
 		    && !dict_table_is_discarded(m_prebuilt->table)) {
-			fts_sync_table(m_prebuilt->table, false, true);
+			fts_sync_table(m_prebuilt->table, false, true, false);
 			fts_optimize_table(m_prebuilt->table);
 		}
 		return(HA_ADMIN_OK);

storage/innobase/include/fts0fts.h

@@ -775,12 +775,11 @@ fts_cache_destroy(
 /*==============*/
 	fts_cache_t*	cache);			/*!< in: cache*/
 
-/*********************************************************************//**
-Clear cache. */
+/** Clear cache.
+@param[in,out]	cache	fts cache */
 void
 fts_cache_clear(
-/*============*/
-	fts_cache_t*	cache);			/*!< in: cache */
+	fts_cache_t*	cache);
 
 /*********************************************************************//**
 Initialize things in cache. */
@@ -827,12 +826,15 @@ FTS auxiliary INDEX table and clear the cache at the end.
 @param[in,out]	table		fts table
 @param[in]	unlock_cache	whether unlock cache when write node
 @param[in]	wait		whether wait for existing sync to finish
+@param[in]	has_dict	whether has dict operation lock, if true
+				unlock it before return
 @return DB_SUCCESS on success, error code on failure. */
 dberr_t
 fts_sync_table(
 	dict_table_t*	table,
 	bool		unlock_cache,
-	bool		wait);
+	bool		wait,
+	bool		has_dict);
 
 /****************************************************************//**
 Free the query graph but check whether dict_sys->mutex is already

storage/innobase/row/row0merge.cc

@@ -2633,7 +2633,7 @@ row_merge_read_clustered_index(
 		/* Sync fts cache for other fts indexes to keep all
 		fts indexes consistent in sync_doc_id. */
 		err = fts_sync_table(const_cast<dict_table_t*>(new_table),
-				     false, true);
+				     false, true, false);
 
 		if (err == DB_SUCCESS) {
 			fts_update_next_doc_id(