bk commit into 5.1 tree (holyfoot:1.2157)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 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
  1.2157 06/05/18 12:42:38 holyfoot@deer.(none) +1 -0
  test result fixed

  mysql-test/r/auto_increment.result
    1.41 06/05/18 12:42:31 holyfoot@stripped +1 -1
    result fixed

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.1.14573

--- 1.40/mysql-test/r/auto_increment.result	Wed May 17 17:12:15 2006
+++ 1.41/mysql-test/r/auto_increment.result	Thu May 18 12:42:31 2006
@@ -422,5 +422,5 @@
 INSERT INTO t1 VALUES(0, 0);
 INSERT INTO t1 VALUES(1, 1);
 ALTER TABLE t1 CHANGE t1 t1 INT(10) auto_increment;
-ERROR 23000: ALTER TABLE causes auto_increment resequencing, causing Duplicate entry '1' for key 'PRIMARY'
+ERROR 23000: ALTER TABLE causes auto_increment resequencing, resulting in duplicate entry '1' for key 'PRIMARY'
 DROP TABLE t1;