bk commit into 5.1 tree (osku:1.1906)

[Osku Salerma]

Below is the list of changes that have just been committed into a local
5.1 repository of osku. When osku does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1906 05/09/08 11:36:11 osku@127.(none) +5 -0
  Merge 127.(none):/home/osku/mysql/5.0/12084
  into  127.(none):/home/osku/mysql/5.1/clean

  storage/innobase/row/row0mysql.c
    1.111 05/09/08 11:36:07 osku@127.(none) +0 -0
    Auto merged

  storage/innobase/include/row0mysql.h
    1.43 05/09/08 11:36:07 osku@127.(none) +0 -0
    Auto merged

  storage/innobase/include/dict0dict.h
    1.35 05/09/08 11:36:07 osku@127.(none) +0 -0
    Auto merged

  storage/innobase/dict/dict0dict.c
    1.68 05/09/08 11:36:07 osku@127.(none) +0 -0
    Auto merged

  sql/ha_innodb.cc
    1.229 05/09/08 11:36:07 osku@127.(none) +0 -0
    Auto merged

  storage/innobase/row/row0mysql.c
    1.103.7.2 05/09/08 11:36:06 osku@127.(none) +0 -0
    Merge rename: innobase/row/row0mysql.c -> storage/innobase/row/row0mysql.c

  storage/innobase/include/row0mysql.h
    1.39.3.2 05/09/08 11:36:06 osku@127.(none) +0 -0
    Merge rename: innobase/include/row0mysql.h -> storage/innobase/include/row0mysql.h

  storage/innobase/include/dict0dict.h
    1.31.3.2 05/09/08 11:36:06 osku@127.(none) +0 -0
    Merge rename: innobase/include/dict0dict.h -> storage/innobase/include/dict0dict.h

  storage/innobase/dict/dict0dict.c
    1.65.1.2 05/09/08 11:36:06 osku@127.(none) +0 -0
    Merge rename: innobase/dict/dict0dict.c -> storage/innobase/dict/dict0dict.c

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	osku
# Host:	127.(none)
# Root:	/home/osku/mysql/5.1/clean/RESYNC

--- 1.228/sql/ha_innodb.cc	2005-09-06 10:11:49 +03:00
+++ 1.229/sql/ha_innodb.cc	2005-09-08 11:36:07 +03:00
@@ -4689,13 +4689,7 @@
 		form->s->row_type != ROW_TYPE_REDUNDANT);
 
   	if (error) {
-		innobase_commit_low(trx);
-
-		row_mysql_unlock_data_dictionary(trx);
-
-  		trx_free_for_mysql(trx);
-
- 		DBUG_RETURN(error);
+		goto cleanup;
  	}
 
 	/* Look for a primary key */
@@ -4719,13 +4713,7 @@
 		error = create_clustered_index_when_no_primary(trx,
 							norm_name);
   		if (error) {
-			innobase_commit_low(trx);
-
-			row_mysql_unlock_data_dictionary(trx);
-
-			trx_free_for_mysql(trx);
-
-			DBUG_RETURN(error);
+			goto cleanup;
       		}
 	}
 
@@ -4734,13 +4722,7 @@
 		first */
 	    	if ((error = create_index(trx, form, norm_name,
 					  (uint) primary_key_no))) {
-			innobase_commit_low(trx);
-
-			row_mysql_unlock_data_dictionary(trx);
-
-  			trx_free_for_mysql(trx);
-
-			DBUG_RETURN(error);
+			goto cleanup;
       		}
       	}
 
@@ -4749,14 +4731,7 @@
 		if (i != (uint) primary_key_no) {
 
     			if ((error = create_index(trx, form, norm_name, i))) {
-
-			  	innobase_commit_low(trx);
-
-				row_mysql_unlock_data_dictionary(trx);
-
-  				trx_free_for_mysql(trx);
-
-				DBUG_RETURN(error);
+				goto cleanup;
       			}
       		}
   	}
@@ -4769,21 +4744,18 @@
 					current_thd->query_length,
 					current_thd->charset())) {
 			error = HA_ERR_OUT_OF_MEM;
-		} else {
-			error = row_table_add_foreign_constraints(trx,
-					q.str, norm_name);
-
-			error = convert_error_code_to_mysql(error, NULL);
+			
+			goto cleanup;
 		}
 
-		if (error) {
-			innobase_commit_low(trx);
-
-			row_mysql_unlock_data_dictionary(trx);
+		error = row_table_add_foreign_constraints(trx,
+			q.str, norm_name,
+			create_info->options & HA_LEX_CREATE_TMP_TABLE);
 
-  			trx_free_for_mysql(trx);
+		error = convert_error_code_to_mysql(error, NULL);
 
-			DBUG_RETURN(error);
+		if (error) {
+			goto cleanup;
 		}
 	}
 
@@ -4823,6 +4795,15 @@
   	trx_free_for_mysql(trx);
 
 	DBUG_RETURN(0);
+
+cleanup:
+	innobase_commit_low(trx);
+	
+	row_mysql_unlock_data_dictionary(trx);
+	
+	trx_free_for_mysql(trx);
+
+	DBUG_RETURN(error);
 }
 
 /*********************************************************************