bzr commit into mysql-5.5-innodb branch (marko.makela:3224)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ based on revid:marko.makela@stripped5zsgyeatvgz2

 3224 Marko Mäkelä	2010-11-04 [merge]
      Merge mysql-5.1-innodb to mysql-5.5-innodb.

    modified:
      storage/innobase/include/row0ins.h
      storage/innobase/row/row0ins.c
=== modified file 'storage/innobase/include/row0ins.h'
--- a/storage/innobase/include/row0ins.h	revid:marko.makela@stripped5zsgyeatvgz2
+++ b/storage/innobase/include/row0ins.h	revid:marko.makela@strippedq
@@ -86,7 +86,8 @@ row_ins_index_entry(
 	dict_index_t*	index,	/*!< in: index */
 	dtuple_t*	entry,	/*!< in/out: index entry to insert */
 	ulint		n_ext,	/*!< in: number of externally stored columns */
-	ibool		foreign,/*!< in: TRUE=check foreign key constraints */
+	ibool		foreign,/*!< in: TRUE=check foreign key constraints
+				(foreign=FALSE only during CREATE INDEX) */
 	que_thr_t*	thr);	/*!< in: query thread */
 /***********************************************************//**
 Inserts a row to a table. This is a high-level function used in

=== modified file 'storage/innobase/row/row0ins.c'
--- a/storage/innobase/row/row0ins.c	revid:marko.makela@stripped5-xg1b5zsgyeatvgz2
+++ b/storage/innobase/row/row0ins.c	revid:marko.makela@strippedk7q
@@ -2152,7 +2152,8 @@ row_ins_index_entry(
 	dict_index_t*	index,	/*!< in: index */
 	dtuple_t*	entry,	/*!< in/out: index entry to insert */
 	ulint		n_ext,	/*!< in: number of externally stored columns */
-	ibool		foreign,/*!< in: TRUE=check foreign key constraints */
+	ibool		foreign,/*!< in: TRUE=check foreign key constraints
+				(foreign=FALSE only during CREATE INDEX) */
 	que_thr_t*	thr)	/*!< in: query thread */
 {
 	ulint	err;

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