Commit e61fcf7c authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
parents 0d165134 aca2e92c

innobase/row/row0mysql.c

+10 −10
Original line number Diff line number Diff line
@@ -2237,14 +2237,14 @@ do not allow the discard. We also reserve the data dictionary latch. */ 
		}

	}

funct_exit:	

  	trx_commit_for_mysql(trx);



	row_mysql_unlock_data_dictionary(trx);



	if (graph) {

		que_graph_free(graph);

	}



  	trx_commit_for_mysql(trx);



	trx->op_info = "";



	return((int) err);
@@ -2374,10 +2374,10 @@ row_import_tablespace_for_mysql( 
	}



funct_exit:	

	row_mysql_unlock_data_dictionary(trx);



  	trx_commit_for_mysql(trx);



	row_mysql_unlock_data_dictionary(trx);



	trx->op_info = "";



	return((int) err);
@@ -2769,6 +2769,8 @@ fputs(" InnoDB: You are trying to drop table ", stderr); 
	}

funct_exit:



  	trx_commit_for_mysql(trx);



	if (locked_dictionary) {

		row_mysql_unlock_data_dictionary(trx);	

	}
@@ -2779,8 +2781,6 @@ fputs(" InnoDB: You are trying to drop table ", stderr); 


	que_graph_free(graph);

	

  	trx_commit_for_mysql(trx);



	trx->op_info = "";



	srv_wake_master_thread();
@@ -2857,10 +2857,10 @@ row_drop_database_for_mysql( 
		}

	}



	row_mysql_unlock_data_dictionary(trx);

	

	trx_commit_for_mysql(trx);



	row_mysql_unlock_data_dictionary(trx);

	

	trx->op_info = "";



	return(err);
@@ -3272,6 +3272,8 @@ row_rename_table_for_mysql( 
		}

	}

funct_exit:	

  	trx_commit_for_mysql(trx);



	if (!recovering_temp_table) {

		row_mysql_unlock_data_dictionary(trx);

	}
@@ -3284,8 +3286,6 @@ row_rename_table_for_mysql( 
		mem_heap_free(heap);

	}

	

  	trx_commit_for_mysql(trx);



	trx->op_info = "";



	return((int) err);