branches/innodb+: Merge revisions 4060:4063 from branches/zip:

  ------------------------------------------------------------------------
  r4061 | marko | 2009-01-29 11:27:09 +0200 (Thu, 29 Jan 2009) | 10 lines

  branches/zip: Port the applicable parts of r4053 from branches/innodb+:
  [...]
  ------------------------------------------------------------------------

In the merge of r4053 to branches/zip, some formatting was corrected
and a ChangeLog entry was added.  Merge these changes back to innodb+.

ChangeLog

+2009-01-29	The InnoDB Team
+
+	* handler/ha_innodb.cc, include/ibuf0ibuf.h, include/ibuf0ibuf.ic,
+	ibuf/ibuf0ibuf.c:
+	Implement the settable global variable innodb_change_buffering,
+	with the allowed values 'none' and 'inserts'.  The default value
+	'inserts' enables the buffering of inserts to non-unique secondary
+	index trees when the B-tree leaf page is not in the buffer pool.
+
 2009-01-27	The InnoDB Team
 
 	* buf/buf0lru.c:

handler/ha_innodb.cc

@@ -9379,7 +9379,7 @@ registered as a callback with MySQL. */
 static
 int
 innodb_change_buffering_validate(
-/*=====================*/
+/*=============================*/
 						/* out: 0 for valid
 						innodb_change_buffering */
 	THD*				thd,	/* in: thread handle */
@@ -9421,7 +9421,7 @@ value. This function is registered as a callback with MySQL. */
 static
 void
 innodb_change_buffering_update(
-/*===================*/
+/*===========================*/
 	THD*				thd,		/* in: thread handle */
 	struct st_mysql_sys_var*	var,		/* in: pointer to
 							system variable */
@@ -9432,7 +9432,7 @@ innodb_change_buffering_update(
 {
 	ut_a(var_ptr != NULL);
 	ut_a(save != NULL);
-	ut_a((*(ibuf_use_t*) save) <= IBUF_USE_ALL);
+	ut_a((*(ibuf_use_t*) save) <= IBUF_USE_INSERT);
 
 	ibuf_use = *(const ibuf_use_t*) save;