diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-12 12:41:19 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-12 12:41:19 +0300 |
commit | 65eefcdc601ef0f57b0779f1722161fc83a571c3 (patch) | |
tree | 7fe642e7d6e685ed87fbd292d986b871b5e0a720 /mysql-test/main/ps.result | |
parent | 9c42b9038dc1457fd4aeed0520bc143a043a84d9 (diff) | |
parent | 36c01167200cf29ac92f3bd3263d7757c55cbb89 (diff) | |
download | mariadb-git-65eefcdc601ef0f57b0779f1722161fc83a571c3.tar.gz |
Merge remote-tracking branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/ps.result')
-rw-r--r-- | mysql-test/main/ps.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/ps.result b/mysql-test/main/ps.result index 45e3f60e431..89de00a38bc 100644 --- a/mysql-test/main/ps.result +++ b/mysql-test/main/ps.result @@ -821,7 +821,7 @@ Warnings: Warning 1292 Truncated incorrect max_prepared_stmt_count value: '10000000000000000' select @@max_prepared_stmt_count; @@max_prepared_stmt_count -1048576 +4294967295 set global max_prepared_stmt_count=default; select @@max_prepared_stmt_count; @@max_prepared_stmt_count |