bzr push into mysql-trunk branch (marko.makela:5344 to 5345)

[marko.makela]

 5345 Marko Mäkelä	2013-01-09 [merge]
      Merge mysql-5.6 to mysql-trunk.

    modified:
      mysql-test/suite/innodb/r/innodb_bug13867871.result
      mysql-test/suite/innodb/t/innodb_bug13867871.test
 5344 Sunny Bains	2013-01-09 [merge]
      Merge from mysql-5.6.

    modified:
      storage/innobase/sync/sync0arr.cc
=== modified file 'mysql-test/suite/innodb/r/innodb_bug13867871.result'
--- a/mysql-test/suite/innodb/r/innodb_bug13867871.result	revid:sunny.bains@stripped1l20
+++ b/mysql-test/suite/innodb/r/innodb_bug13867871.result	revid:marko.makela@strippedmxcz3dj0o8
@@ -74,6 +74,7 @@ SET DEBUG_SYNC = 'foreign_constraint_che
 SET DEBUG_SYNC = 'now SIGNAL altered';
 /* con1 reap */ UPDATE parent SET a = 3;
 /* default reap */ ALTER TABLE child ADD INDEX idx_2(B, C), DROP INDEX idx;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 SELECT * FROM child;
 a	d	b	c
 1	5	khD	khD

=== modified file 'mysql-test/suite/innodb/t/innodb_bug13867871.test'
--- a/mysql-test/suite/innodb/t/innodb_bug13867871.test	revid:sunny.bains@strippedthiipfdlyhyd1l20
+++ b/mysql-test/suite/innodb/t/innodb_bug13867871.test	revid:marko.makela@stripped529-359mwcmxcz3dj0o8
@@ -164,8 +164,7 @@ reap;
 
 connection default;
 --echo /* default reap */ ALTER TABLE child ADD INDEX idx_2(B, C), DROP INDEX idx;
-# TODO (Bug#14529475): investigate why this is nondeterministic
---error 0,ER_LOCK_WAIT_TIMEOUT,ER_LOCK_DEADLOCK
+--error ER_LOCK_WAIT_TIMEOUT
 reap;
 SELECT * FROM child;
 

No bundle (reason: useless for push emails).