Update after merge.

Use mutex when reading prepared_stmt_count global status variable.

Update test case for bug 16365 and bug 23159: add test for
prepared_stmt_count being decreased when some connection that had
prepared statements is closed.

1 files changed, 11 insertions, 0 deletions

diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index 0a739c05eda..a64764f623f 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -950,7 +950,18 @@ select @@max_prepared_stmt_count;
 show status like 'prepared_stmt_count';
 disconnect con1;
 connection default;
+# Wait for the connection to die: deal with a possible race
 deallocate prepare stmt;
+let $query= select variable_value from information_schema.global_status
+            where variable_name = 'prepared_stmt_count';
+let $count= `$query`;
+if ($count)
+{
+--sleep 1
+  let $count= `$query`;
+}
+select @@max_prepared_stmt_count;
+show status like 'prepared_stmt_count';
 #
 # Restore the old value.
 #