bk commit into 4.1 tree (jimw:1.2307)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw 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.2307 05/06/01 14:35:02 jimw@stripped +1 -0
  Update results of test after merge of bugfix

  mysql-test/r/rpl_failed_optimize.result
    1.2 05/06/01 14:33:40 jimw@stripped +1 -0
    Update results

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-clean

--- 1.1/mysql-test/r/rpl_failed_optimize.result	2004-11-03 09:22:59 -08:00
+++ 1.2/mysql-test/r/rpl_failed_optimize.result	2005-06-01 14:33:40 -07:00
@@ -9,6 +9,7 @@
 INSERT INTO t1 VALUES (1);
 OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
+test.t1	optimize	error	Lock wait timeout exceeded; try restarting transaction
 test.t1	optimize	status	Operation failed
 OPTIMIZE TABLE non_existing;
 Table	Op	Msg_type	Msg_text