bzr commit into mysql-5.1-innodb branch (jimmy.yang:3697) Bug#59749

[Jimmy Yang]

#At file:///home/jy/work/mysql5.1_7/mysql-5.1-innodb/ based on revid:marko.makela@stripped

 3697 Jimmy Yang	2011-01-31
      Fix Bug #59749 Enabling concurrent reads while creating non-primary
      unique index gives failures

    modified:
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/handler/handler0alter.cc
=== modified file 'storage/innodb_plugin/ChangeLog'
--- a/storage/innodb_plugin/ChangeLog	revid:marko.makela@stripped
+++ b/storage/innodb_plugin/ChangeLog	revid:jimmy.yang@stripped
@@ -1,5 +1,11 @@
 2011-01-31	The InnoDB Team
 
+	* handler/handler0alter.cc:
+	Bug#59749 Enabling concurrent reads while creating non-primary
+	unique index gives failures
+
[phone]	The InnoDB Team
+
 	* btr/btr0cur.c, include/row0upd.h,
 	row/row0purge.c, row/row0umod.c, row/row0upd.c:
 	Bug#59230 assert 0 row_upd_changes_ord_field_binary()

=== modified file 'storage/innodb_plugin/handler/handler0alter.cc'
--- a/storage/innodb_plugin/handler/handler0alter.cc	revid:marko.makela@stripped
+++ b/storage/innodb_plugin/handler/handler0alter.cc	revid:jimmy.yang@stripped
@@ -782,10 +782,6 @@ err_exit:
 
 	ut_ad(error == DB_SUCCESS);
 
-	/* We will need to rebuild index translation table. Set
-	valid index entry count in the translation table to zero */
-	share->idx_trans_tbl.index_count = 0;
-
 	/* Commit the data dictionary transaction in order to release
 	the table locks on the system tables.  This means that if
 	MySQL crashes while creating a new primary key inside
@@ -911,6 +907,14 @@ error:
 		}
 
 convert_error:
+		if (error == DB_SUCCESS) {
+			/* Build index is successful. We will need to
+			rebuild index translation table.  Reset the
+			index entry count in the translation table
+			to zero, so that translation table will be rebuilt */
+			share->idx_trans_tbl.index_count = 0;
+		}
+
 		error = convert_error_code_to_mysql(error,
 						    innodb_table->flags,
 						    user_thd);


Attachment: [text/bzr-bundle] bzr/[e-mail]