bzr push into mysql-5.1-telco-7.0 branch (frazer.clement:4799 to 4800)

[Frazer Clement]

 4800 Frazer Clement	2012-01-17
      Another Windows result file fix

    modified:
      mysql-test/suite/ndb_rpl/t/show_mysqld_warnings.inc
 4799 jonas oreland	2012-01-17
      ndb - bug#13528976 - remove cdata[] from Dbtc. It had an overflow for scans (or node-failure) with more than 32 fragments (nodes failing)

    modified:
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
=== 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-17 13:51:35 +0000
+++ b/mysql-test/suite/ndb_rpl/t/show_mysqld_warnings.inc	2012-01-17 15:41:38 +0000
@@ -2,7 +2,7 @@
 --echo MySQLD error output for server $server_num matching pattern $pattern
 create table errlog (a int auto_increment primary key, txt text) engine=myisam;
 
---eval load data local infile "$MYSQLTEST_VARDIR/log/mysqld.$server_num.err" into table errlog (txt);
+--eval load data local infile "$MYSQLTEST_VARDIR/log/mysqld.$server_num.err" into table errlog columns terminated by '\n' (txt);
 
 --eval select replace( lower( right(txt, length(txt) - locate('[',txt) + 1)), '\r', '') as relevant from errlog where txt like '$pattern' order by a desc limit $limit;
 

No bundle (reason: useless for push emails).