fix for a random test failure on hpux/ia64

(a missing synchronization in the test)


mysql-test/r/drop_temp_table.result:
  result update
mysql-test/t/drop_temp_table.test:
  synchronize to be sure that the ending connection has finished binlogging.

2 files changed, 13 insertions, 0 deletions

diff --git a/mysql-test/r/drop_temp_table.result b/mysql-test/r/drop_temp_table.result
index 385a3fb6e5c..6b18b54335d 100644
--- a/mysql-test/r/drop_temp_table.result
+++ b/mysql-test/r/drop_temp_table.result
@@ -2,10 +2,17 @@ reset master;
 create database `drop-temp+table-test`;
 use `drop-temp+table-test`;
 create temporary table `table:name` (a int);
+select get_lock("a",10);
+get_lock("a",10)
+1
+select get_lock("a",10);
+get_lock("a",10)
+1
 show binlog events;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
 master-bin.001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
 master-bin.001	79	Query	1	79	use `test`; create database `drop-temp+table-test`
 master-bin.001	152	Query	1	152	use `drop-temp+table-test`; create temporary table `table:name` (a int)
 master-bin.001	246	Query	1	246	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE `drop-temp+table-test`.`table:name`
+master-bin.001	365	Query	1	365	use `drop-temp+table-test`; DO RELEASE_LOCK("a")
 drop database `drop-temp+table-test`;
diff --git a/mysql-test/t/drop_temp_table.test b/mysql-test/t/drop_temp_table.test
index 4849e998bf5..1a7d8796bb3 100644
--- a/mysql-test/t/drop_temp_table.test
+++ b/mysql-test/t/drop_temp_table.test
@@ -5,8 +5,14 @@ reset master;
 create database `drop-temp+table-test`;
 use `drop-temp+table-test`;
 create temporary table `table:name` (a int);
+select get_lock("a",10);
 disconnect con1;
+
 connection con2;
+# We want to SHOW BINLOG EVENTS, to know what was logged. But there is no
+# guarantee that logging of the terminated con1 has been done yet.
+# To be sure that logging has been done, we use a user lock.
+select get_lock("a",10);
 let $VERSION=`select version()`;
 --replace_result $VERSION VERSION
 show binlog events;