From: Frazer Clement
Date: January 11 2012 4:11pm
Subject: bzr push into mysql-5.1-telco-7.0 branch (frazer.clement:4784 to 4785)
List-Archive: http://lists.mysql.com/commits/142378
Message-Id: <201201111611.q0BGBITq008747@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4785 Frazer Clement	2012-01-11
      Fix table name case difference on Windows

    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result
      mysql-test/suite/ndb_rpl/t/show_mysqld_warnings.inc
 4784 Jonas Oreland	2012-01-11
      ndb - fix problem in trpman-proxy, causing close_comreq caused by prep_failreq to return to incorrect address

    modified:
      storage/ndb/src/kernel/blocks/trpman.cpp
=== modified file 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result'
--- a/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result	2012-01-11 11:07:09 +0000
+++ b/mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result	2012-01-11 16:08:31 +0000
@@ -257,22 +257,22 @@ show variables like 'server_id';
 Variable_name	Value
 server_id	1
 MySQLD error output for server 1.1 matching pattern %NDB Slave%
-right(txt, length(txt) - locate('[',txt) + 1)
-[Note] NDB Slave: Table test.t2diffex using conflict_fn NDB$OLD on attribute X.
-[Note] NDB Slave: Table test.t2diffex logging exceptions to test.t2diffex$EX
-[Note] NDB Slave: Table test.t1allsame using conflict_fn NDB$MAX on attribute X.
-[Note] NDB Slave: Table test.t2_max using conflict_fn NDB$MAX on attribute X.
+relevant
+[note] ndb slave: table test.t2diffex using conflict_fn ndb$old on attribute x.
+[note] ndb slave: table test.t2diffex logging exceptions to test.t2diffex$ex
+[note] ndb slave: table test.t1allsame using conflict_fn ndb$max on attribute x.
+[note] ndb slave: table test.t2_max using conflict_fn ndb$max on attribute x.
 show variables like 'server_id';
 Variable_name	Value
 server_id	3
 MySQLD error output for server 2.1 matching pattern %NDB Slave%
-right(txt, length(txt) - locate('[',txt) + 1)
-[Warning] NDB Slave: Table test.t3oneex : No extra row author bits in table.
-[Note] NDB Slave: Table test.t3oneex : CFT_NDB_EPOCH[_TRANS], low epoch resolution
-[Note] NDB Slave: Table test.t2diffex using conflict_fn NDB$MAX on attribute X.
-[Note] NDB Slave: Table test.t2diffex logging exceptions to test.t2diffex$EX
-[Note] NDB Slave: Table test.t1allsame using conflict_fn NDB$MAX on attribute X.
-[Note] NDB Slave: Table test.t2_max using conflict_fn NDB$MAX on attribute X.
+relevant
+[warning] ndb slave: table test.t3oneex : no extra row author bits in table.
+[note] ndb slave: table test.t3oneex : cft_ndb_epoch[_trans], low epoch resolution
+[note] ndb slave: table test.t2diffex using conflict_fn ndb$max on attribute x.
+[note] ndb slave: table test.t2diffex logging exceptions to test.t2diffex$ex
+[note] ndb slave: table test.t1allsame using conflict_fn ndb$max on attribute x.
+[note] ndb slave: table test.t2_max using conflict_fn ndb$max on attribute x.
 drop table t3oneex, t2diffex, t1allsame, t3oneex$EX, t2diffex$EX;
 "Cleanup"
 drop table mysql.ndb_replication;

=== modified file 'mysql-test/suite/ndb_rpl/t/show_mysqld_warnings.inc'
--- a/mysql-test/suite/ndb_rpl/t/show_mysqld_warnings.inc	2012-01-11 11:07:09 +0000
+++ b/mysql-test/suite/ndb_rpl/t/show_mysqld_warnings.inc	2012-01-11 16:08:31 +0000
@@ -4,7 +4,7 @@ create table errlog (a int auto_incremen
 
 --eval load data local infile "$MYSQLTEST_VARDIR/log/mysqld.$server_num.err" into table errlog (txt);
 
---eval select right(txt, length(txt) - locate('[',txt) + 1) from errlog where txt like '$pattern' order by a desc limit $limit;
+--eval select lower(right(txt, length(txt) - locate('[',txt) + 1)) as relevant from errlog where txt like '$pattern' order by a desc limit $limit;
 
 drop table errlog;
 --enable_query_log

No bundle (reason: useless for push emails).