bk commit into 6.0 tree (holyfoot:1.2720)

[holyfoot]

Below is the list of changes that have just been committed into a local
6.0 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-07 15:33:02+04:00, holyfoot@stripped +1 -0
  merging

  mysql-test/r/archive_aio_posix.result@stripped, 2007-12-07 15:32:59+04:00, holyfoot@stripped +1 -1
    merging

diff -Nrup a/mysql-test/r/archive_aio_posix.result b/mysql-test/r/archive_aio_posix.result
--- a/mysql-test/r/archive_aio_posix.result	2007-10-16 22:28:34 +05:00
+++ b/mysql-test/r/archive_aio_posix.result	2007-12-07 15:32:59 +04:00
@@ -12668,7 +12668,7 @@ t6	CREATE TABLE `t6` (
   `b` tinyblob,
   `c` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=ARCHIVE DEFAULT CHARSET=latin1
+) ENGINE=ARCHIVE AUTO_INCREMENT=36 DEFAULT CHARSET=latin1
 DROP TABLE t1, t2, t4, t5, t6;
 create table t1 (i int) engine=archive;
 insert into t1 values (1);