fixes for the merge with codership-mysql, revision 3839

sql/wsrep_hton.cc

@@ -240,7 +240,7 @@ wsrep_run_wsrep_commit(
 
   while (wsrep_replaying > 0                       && 
          thd->wsrep_conflict_state == NO_CONFLICT  &&
-         thd->killed == THD::NOT_KILLED            &&
+         thd->killed == NOT_KILLED                 &&
          !shutdown_in_progress) 
   {
 

storage/innobase/handler/ha_innodb.cc

@@ -7030,23 +7030,9 @@ wsrep_append_foreign_key(
 		mutex_enter(&(dict_sys->mutex));
 		if (referenced)
 		{
-<<<<<<< TREE
-			foreign->referenced_table = 
-				dict_table_check_if_in_cache_low(
-=======
 			foreign->referenced_table =
 				dict_table_get_low(
->>>>>>> MERGE-SOURCE
 					foreign->referenced_table_name_lookup);
-<<<<<<< TREE
-			foreign->referenced_index = 
-				wsrep_dict_foreign_find_index(
-					foreign->referenced_table,
-					foreign->referenced_col_names,
-					foreign->n_fields, 
-					foreign->foreign_index,
-					TRUE, FALSE);
-=======
 			if (foreign->referenced_table)
 			{
 				foreign->referenced_index =
@@ -7057,28 +7043,12 @@ wsrep_append_foreign_key(
 						foreign->foreign_index,
 						TRUE, FALSE);
 			}
->>>>>>> MERGE-SOURCE
 		}
 		else
 		{
-<<<<<<< TREE
-	  		foreign->foreign_table = 
-				dict_table_check_if_in_cache_low(
-=======
 	  		foreign->foreign_table =
 				dict_table_get_low(
->>>>>>> MERGE-SOURCE
 					foreign->foreign_table_name_lookup);
-<<<<<<< TREE
-			foreign->foreign_index = 
-				wsrep_dict_foreign_find_index(
-					foreign->foreign_table,
-					foreign->foreign_col_names,
-					foreign->n_fields,
-					foreign->referenced_index, 
-					TRUE, FALSE);
-
-=======
 			if (foreign->foreign_table)
 			{
 				foreign->foreign_index =
@@ -7089,7 +7059,6 @@ wsrep_append_foreign_key(
 						foreign->referenced_index, 
 						TRUE, FALSE);
 			}
->>>>>>> MERGE-SOURCE
 		}
 		mutex_exit(&(dict_sys->mutex));
 	}