summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps.result
diff options
context:
space:
mode:
authorTatiana A. Nurnberg <azundris@mysql.com>2009-02-27 21:43:43 +0100
committerTatiana A. Nurnberg <azundris@mysql.com>2009-02-27 21:43:43 +0100
commitfe09326edf3f3319d9e998630fc684d618c87bcb (patch)
tree8d737ed4160667b74a74e4c0dee88b3b4dfa7918 /mysql-test/r/ps.result
parentcd5744db13a186add2814da0aed0719817ac075b (diff)
parent71913e350a2dc1964d1298d14d4c5d692c419ce1 (diff)
downloadmariadb-git-fe09326edf3f3319d9e998630fc684d618c87bcb.tar.gz
automerge
Diffstat (limited to 'mysql-test/r/ps.result')
-rw-r--r--mysql-test/r/ps.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index e59b0ba9834..f263ff23088 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -803,6 +803,8 @@ select @@max_prepared_stmt_count;
@@max_prepared_stmt_count
16382
set global max_prepared_stmt_count=-1;
+Warnings:
+Warning 1292 Truncated incorrect max_prepared_stmt_count value: '-1'
select @@max_prepared_stmt_count;
@@max_prepared_stmt_count
0