branches/5.1:

Merge change from MySQL AB:

ChangeSet@1.2639, 2007-11-23 12:51:14+01:00, mkindahl@dl145h.mysql.com +7 -0
  Post-merge fixes.

  mysql-test/r/innodb.result@1.206, 2007-11-23 12:51:10+01:00, mkindahl@dl145h.mysql.com +1 -1
    Result change.

mysql-test/innodb.result

@@ -1727,10 +1727,10 @@ Variable_name	Value
 Innodb_page_size	16384
 show status like "Innodb_rows_deleted";
 Variable_name	Value
-Innodb_rows_deleted	69
+Innodb_rows_deleted	70
 show status like "Innodb_rows_inserted";
 Variable_name	Value
-Innodb_rows_inserted	1080
+Innodb_rows_inserted	1082
 show status like "Innodb_rows_updated";
 Variable_name	Value
 Innodb_rows_updated	885