bk commit into 5.1 tree (istruewing:1.2604) BUG#32048

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing 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-11-02 09:58:29+01:00, istruewing@stripped +2 -0
  Bug#32048 - innodb_mysql.test produces warnings files
  
  Typo --#echo at line begin in test files lead to warnings
  from mysqltest.
    
  Changed to --echo #.

  mysql-test/include/mix1.inc@stripped, 2007-11-02 09:58:27+01:00, istruewing@stripped +1 -1
    Bug#32048 - innodb_mysql.test produces warnings files
    Fixed comment sign

  mysql-test/r/innodb_mysql.result@stripped, 2007-11-02 09:58:27+01:00, istruewing@stripped +1 -0
    Bug#32048 - innodb_mysql.test produces warnings files
    Fixed test result

diff -Nrup a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc
--- a/mysql-test/include/mix1.inc	2007-10-23 16:08:18 +02:00
+++ b/mysql-test/include/mix1.inc	2007-11-02 09:58:27 +01:00
@@ -1163,7 +1163,7 @@ CREATE TABLE t1 (a INT PRIMARY KEY, b VA
 ENGINE = $engine_type;
 INSERT INTO t1 VALUES (1,2);
 
---#echo 1. test for locking:
+--echo # 1. test for locking:
 
 BEGIN;
 --enable_info
diff -Nrup a/mysql-test/r/innodb_mysql.result b/mysql-test/r/innodb_mysql.result
--- a/mysql-test/r/innodb_mysql.result	2007-10-23 16:08:18 +02:00
+++ b/mysql-test/r/innodb_mysql.result	2007-11-02 09:58:27 +01:00
@@ -1426,6 +1426,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL 
 CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(256))
 ENGINE = InnoDB;
 INSERT INTO t1 VALUES (1,2);
+# 1. test for locking:
 BEGIN;
 UPDATE t1 SET b = 12 WHERE a = 1;
 affected rows: 1