bk commit into 5.1 tree (msvensson:1.2351)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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, 2006-10-07 20:22:25+02:00, msvensson@neptunus.(none) +3 -0
  Update result format

  mysql-test/r/binlog_row_mix_innodb_myisam.result@stripped, 2006-10-07 20:22:23+02:00, msvensson@neptunus.(none) +1 -1
    Update result format

  mysql-test/r/rpl_ndb_sp003.result@stripped, 2006-10-07 20:22:23+02:00, msvensson@neptunus.(none) +1 -1
    Update result format

  mysql-test/r/rpl_row_sp003.result@stripped, 2006-10-07 20:22:23+02:00, msvensson@neptunus.(none) +1 -1
    Update result format

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.1/mysql-test/r/rpl_ndb_sp003.result	2006-10-07 20:22:31 +02:00
+++ 1.2/mysql-test/r/rpl_ndb_sp003.result	2006-10-07 20:22:31 +02:00
@@ -21,7 +21,7 @@
 SELECT get_lock("test", 200);
 get_lock("test", 200)
 1
- CALL test.p1();
+CALL test.p1();
 CALL test.p2();
 SELECT release_lock("test");
 release_lock("test")

--- 1.12/mysql-test/r/binlog_row_mix_innodb_myisam.result	2006-10-07 20:22:31 +02:00
+++ 1.13/mysql-test/r/binlog_row_mix_innodb_myisam.result	2006-10-07 20:22:31 +02:00
@@ -220,7 +220,7 @@
 (@before:=unix_timestamp())*0
 0
 begin;
- select * from t1 for update;
+select * from t1 for update;
 insert into t2 values (20);
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 select (@after:=unix_timestamp())*0;

--- 1.1/mysql-test/r/rpl_row_sp003.result	2006-10-07 20:22:32 +02:00
+++ 1.2/mysql-test/r/rpl_row_sp003.result	2006-10-07 20:22:32 +02:00
@@ -21,7 +21,7 @@
 SELECT get_lock("test", 200);
 get_lock("test", 200)
 1
- CALL test.p1();
+CALL test.p1();
 CALL test.p2();
 SELECT release_lock("test");
 release_lock("test")