bzr push into mysql-trunk branch (andrei.elkin:3638 to 3639) Bug#12982188

[Andrei Elkin]

 3639 Andrei Elkin	2011-11-22
      bug#12982188 post-push fixing a test result file.

    modified:
      mysql-test/suite/rpl/r/rpl_parallel_load_data.result
 3638 Jimmy Yang	2011-11-22
      Fix an issue that FTS parallel sort merge's event signal got lost situation.
      Add timeout for checking the merge result.

    modified:
      storage/innobase/row/row0merge.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_parallel_load_data.result'
--- a/mysql-test/suite/rpl/r/rpl_parallel_load_data.result	2011-11-21 17:46:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_parallel_load_data.result	2011-11-22 09:45:19 +0000
@@ -1,4 +1,7 @@
 include/master-slave.inc
+Warnings:
+Note	1756	Sending passwords in plain text without SSL/TLS is extremely insecure.
+Note	1757	Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives.
 [connection master]
 include/stop_slave.inc
 SET @save_slave_parallel_workers= @@slave_parallel_workers;

No bundle (reason: useless for push emails).