summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps.result
diff options
context:
space:
mode:
authorunknown <kroki/tomash@moonlight.intranet>2006-11-21 17:23:54 +0300
committerunknown <kroki/tomash@moonlight.intranet>2006-11-21 17:23:54 +0300
commit5e1c2e3644daf8655a4cfc495403541a8321b774 (patch)
treec3337bea76df7e741e64f0a208accf9881ec5992 /mysql-test/r/ps.result
parent8b4a32afcd63305a1b04023e6a9ea904966f8a37 (diff)
downloadmariadb-git-5e1c2e3644daf8655a4cfc495403541a8321b774.tar.gz
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. mysql-test/r/ps.result: Update result for bug#16365 and bug#23159. mysql-test/t/ps.test: 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. sql/mysqld.cc: Use mutex when reading prepared_stmt_count global status variable.
Diffstat (limited to 'mysql-test/r/ps.result')
-rw-r--r--mysql-test/r/ps.result6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 0334a52c7ae..a6c16a9d15d 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -898,6 +898,12 @@ show status like 'prepared_stmt_count';
Variable_name Value
Prepared_stmt_count 3
deallocate prepare stmt;
+select @@max_prepared_stmt_count;
+@@max_prepared_stmt_count
+3
+show status like 'prepared_stmt_count';
+Variable_name Value
+Prepared_stmt_count 0
set global max_prepared_stmt_count= @old_max_prepared_stmt_count;
drop table if exists t1;
create temporary table if not exists t1 (a1 int);