bzr push into mysql-trunk-wl6255 branch (marko.makela:3876 to 3877) WL#6255

[marko.makela]

 3877 Marko Mäkelä	2012-05-28
      WL#6255 preparation: row_ins_duplicate_error_in_clust():
      Initialize err when suppressing locking.

    modified:
      storage/innobase/row/row0ins.cc
 3876 Marko Mäkelä	2012-05-28
      WL#6255: Implement in-place DROP PRIMARY KEY (DROP_PK_INDEX)
      when ADD PRIMARY KEY is specified at the same time.
      
      innobase_fts_check_doc_id_index_in_def(): Add an optional output parameter
      for the FTS_DOC_ID column number.
      
      ha_innobase::check_if_supported_inplace_alter(): Allow DROP_PK_INDEX
      only if ADD_PK_INDEX is specified at the same time.
      
      ha_innobase::prepare_inplace_alter_table(): For DROP_PK_INDEX, do not
      collect the clustered index in drop_index[].

    modified:
      mysql-test/r/group_min_max_innodb.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      storage/innobase/handler/handler0alter.cc
=== modified file 'storage/innobase/row/row0ins.cc'
--- a/storage/innobase/row/row0ins.cc	revid:[e-mail]-20120528085724-d8zn6ng382v01sd2
+++ b/storage/innobase/row/row0ins.cc	revid:marko.makela@stripped0528093934-xkntw4prq5siklzb
@@ -2006,6 +2006,7 @@ row_ins_duplicate_error_in_clust(
 			if (flags & BTR_NO_LOCKING_FLAG) {
 				/* Set no locks when applying log
 				in online table rebuild. */
+				err = DB_SUCCESS;
 			} else if (trx->duplicates) {
 
 				/* If the SQL-query will update or replace
@@ -2053,6 +2054,7 @@ row_ins_duplicate_error_in_clust(
 			if (flags & BTR_NO_LOCKING_FLAG) {
 				/* Set no locks when applying log
 				in online table rebuild. */
+				err = DB_SUCCESS;
 			} else if (trx->duplicates) {
 
 				/* If the SQL-query will update or replace

No bundle (reason: useless for push emails).