Merge from mysql-5.6 to mysql-5.7

Author: gurusami

storage/innobase/dict/dict0dict.cc

@@ -3387,23 +3387,6 @@ dict_table_get_foreign_constraint(
 	return(NULL);
 }
 
-/*********************************************************************//**
-Frees a foreign key struct. */
-
-void
-dict_foreign_free(
-/*==============*/
-	dict_foreign_t*	foreign)	/*!< in, own: foreign key struct */
-{
-	DBUG_ENTER("dict_foreign_free");
-	DBUG_PRINT("dict_foreign_free", ("id: '%s', heap: %p", foreign->id,
-					 foreign->heap));
-
-	mem_heap_free(foreign->heap);
-
-	DBUG_VOID_RETURN;
-}
-
 /**********************************************************************//**
 Removes a foreign constraint struct from the dictionary cache. */
 
@@ -4385,6 +4368,7 @@ dict_create_foreign_constraints_low(
 	const char*	column_names[500];
 	const char*	referenced_table_name;
 	dict_foreign_set	local_fk_set;
+	dict_foreign_set_free	local_fk_set_free(local_fk_set);
 
 	ut_ad(!srv_read_only_mode || handler);
 	ut_ad(mutex_own(&(dict_sys->mutex)) || handler);
@@ -4513,17 +4497,10 @@ dict_create_foreign_constraints_low(
 
 			table->foreign_set.insert(local_fk_set.begin(),
 						  local_fk_set.end());
-
-			for (dict_foreign_set::iterator it
-				= local_fk_set.begin();
-			     it != local_fk_set.end();
-			     ++it) {
-
-				dict_table_t*	ref = (*it)->referenced_table;
-				if (ref != NULL) {
-					ref->referenced_set.insert(*it);
-				}
-			}
+			std::for_each(local_fk_set.begin(),
+				      local_fk_set.end(),
+				      dict_foreign_add_to_referenced_table());
+			local_fk_set.clear();
 		}
 		return(error);
 	}
@@ -4655,6 +4632,21 @@ dict_create_foreign_constraints_low(
 		strcpy(foreign->id + db_len + 1, constraint_name);
 	}
 
+	if (foreign->id == NULL) {
+		error = dict_create_add_foreign_id(&number,
+						   table->name, foreign);
+		if (error != DB_SUCCESS) {
+			dict_foreign_free(foreign);
+			return(error);
+		}
+	}
+
+	std::pair<dict_foreign_set::iterator, bool>	ret
+		= local_fk_set.insert(foreign);
+
+	ut_a(ret.second);	/* second is true if the insertion
+				took place */
+
 	foreign->foreign_table = table;
 	foreign->foreign_table_name = mem_heap_strdup(
 		foreign->heap, table->name);
@@ -4680,8 +4672,6 @@ dict_create_foreign_constraints_low(
 	checking of foreign key constraints! */
 
 	if (!success || (!referenced_table && trx->check_foreigns)) {
-		dict_foreign_free(foreign);
-
 		mutex_enter(&dict_foreign_err_mutex);
 		dict_foreign_error_report_low(ef, name);
 		fprintf(ef, "%s:\nCannot resolve table name close to:\n"
@@ -4695,7 +4685,6 @@ dict_create_foreign_constraints_low(
 	ptr = dict_accept(cs, ptr, "(", &success);
 
 	if (!success) {
-		dict_foreign_free(foreign);
 		dict_foreign_report_syntax_err(name, start_of_latest_foreign,
 					       ptr);
 		return(DB_CANNOT_ADD_CONSTRAINT);
@@ -4710,7 +4699,6 @@ dict_create_foreign_constraints_low(
 	i++;
 
 	if (!success) {
-		dict_foreign_free(foreign);
 
 		mutex_enter(&dict_foreign_err_mutex);
 		dict_foreign_error_report_low(ef, name);
@@ -4731,7 +4719,6 @@ dict_create_foreign_constraints_low(
 	ptr = dict_accept(cs, ptr, ")", &success);
 
 	if (!success || foreign->n_fields != i) {
-		dict_foreign_free(foreign);
 
 		dict_foreign_report_syntax_err(name, start_of_latest_foreign,
 					       ptr);
@@ -4757,7 +4744,6 @@ dict_create_foreign_constraints_low(
 		ptr = dict_accept(cs, ptr, "UPDATE", &success);
 
 		if (!success) {
-			dict_foreign_free(foreign);
 
 			dict_foreign_report_syntax_err(
 				name, start_of_latest_foreign, ptr);
@@ -4795,7 +4781,6 @@ dict_create_foreign_constraints_low(
 		ptr = dict_accept(cs, ptr, "ACTION", &success);
 
 		if (!success) {
-			dict_foreign_free(foreign);
 			dict_foreign_report_syntax_err(
 				name, start_of_latest_foreign, ptr);
 
@@ -4814,7 +4799,6 @@ dict_create_foreign_constraints_low(
 	ptr = dict_accept(cs, ptr, "SET", &success);
 
 	if (!success) {
-		dict_foreign_free(foreign);
 		dict_foreign_report_syntax_err(name, start_of_latest_foreign,
 					       ptr);
 		return(DB_CANNOT_ADD_CONSTRAINT);
@@ -4823,7 +4807,6 @@ dict_create_foreign_constraints_low(
 	ptr = dict_accept(cs, ptr, "NULL", &success);
 
 	if (!success) {
-		dict_foreign_free(foreign);
 		dict_foreign_report_syntax_err(name, start_of_latest_foreign,
 					       ptr);
 		return(DB_CANNOT_ADD_CONSTRAINT);
@@ -4836,8 +4819,6 @@ dict_create_foreign_constraints_low(
 			/* It is not sensible to define SET NULL
 			if the column is not allowed to be NULL! */
 
-			dict_foreign_free(foreign);
-
 			mutex_enter(&dict_foreign_err_mutex);
 			dict_foreign_error_report_low(ef, name);
 			fprintf(ef, "%s:\n"
@@ -4863,8 +4844,6 @@ dict_create_foreign_constraints_low(
 	if (n_on_deletes > 1 || n_on_updates > 1) {
 		/* It is an error to define more than 1 action */
 
-		dict_foreign_free(foreign);
-
 		mutex_enter(&dict_foreign_err_mutex);
 		dict_foreign_error_report_low(ef, name);
 		fprintf(ef, "%s:\n"
@@ -4886,7 +4865,6 @@ dict_create_foreign_constraints_low(
 						foreign->foreign_index,
 						TRUE, FALSE);
 		if (!index) {
-			dict_foreign_free(foreign);
 			mutex_enter(&dict_foreign_err_mutex);
 			dict_foreign_error_report_low(ef, name);
 			fprintf(ef, "%s:\n"
@@ -4928,21 +4906,6 @@ dict_create_foreign_constraints_low(
 			= mem_heap_strdup(foreign->heap, column_names[i]);
 	}
 
-	/* We found an ok constraint definition: add to the set */
-
-	if (foreign->id == NULL) {
-		error = dict_create_add_foreign_id(&number,
-						   table->name, foreign);
-		if (error != DB_SUCCESS) {
-			return(error);
-		}
-	}
-
-	std::pair<dict_foreign_set::iterator, bool>	ret
-		= local_fk_set.insert(foreign);
-
-	ut_a(ret.second);	/* second is true if the insertion
-				took place */
 	goto loop;
 }
 /**************************************************************************

storage/innobase/include/dict0mem.h

@@ -49,6 +49,7 @@ Created 1/8/1996 Heikki Tuuri
 #include "gis0type.h"
 #include "os0once.h"
 #include <set>
+#include <algorithm>
 
 /* Forward declaration. */
 struct ib_rbt_t;
@@ -924,6 +925,37 @@ struct dict_foreign_matches_id {
 
 typedef std::set<dict_foreign_t*, dict_foreign_compare> dict_foreign_set;
 
+/*********************************************************************//**
+Frees a foreign key struct. */
+inline
+void
+dict_foreign_free(
+/*==============*/
+	dict_foreign_t*	foreign)	/*!< in, own: foreign key struct */
+{
+	mem_heap_free(foreign->heap);
+}
+
+/** The destructor will free all the foreign key constraints in the set
+by calling dict_foreign_free() on each of the foreign key constraints.
+This is used to free the allocated memory when a local set goes out
+of scope. */
+struct dict_foreign_set_free {
+
+	dict_foreign_set_free(const dict_foreign_set&	foreign_set)
+		: m_foreign_set(foreign_set)
+	{}
+
+	~dict_foreign_set_free()
+	{
+		std::for_each(m_foreign_set.begin(),
+			      m_foreign_set.end(),
+			      dict_foreign_free);
+	}
+
+	const dict_foreign_set&	m_foreign_set;
+};
+
 /** The flags for ON_UPDATE and ON_DELETE can be ORed; the default is that
 a foreign key constraint is enforced, therefore RESTRICT just means no flag */
 /* @{ */
@@ -1303,6 +1335,19 @@ lock_table_lock_list_init(
 /*======================*/
 	table_lock_list_t*	locks);		/*!< List to initialise */
 
+/** A function object to add the foreign key constraint to the referenced set
+of the referenced table, if it exists in the dictionary cache. */
+struct dict_foreign_add_to_referenced_table {
+	void operator()(dict_foreign_t*	foreign) const
+	{
+		if (dict_table_t* table = foreign->referenced_table) {
+			std::pair<dict_foreign_set::iterator, bool>	ret
+				= table->referenced_set.insert(foreign);
+			ut_a(ret.second);
+		}
+	}
+};
+
 #ifndef UNIV_NONINL
 #include "dict0mem.ic"
 #endif