diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-02 03:19:07 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-02 03:19:07 +0100 |
| commit | 70cb41a240268ace3d6a8a75c28b7d9ae2a04079 (patch) | |
| tree | 9c97f7a03204559208c97b73dfdb1d270657c44a /mysql-test/r/ps.result | |
| parent | 25886c069e8aa9828396f92d2028c983147bdf75 (diff) | |
| parent | 58f10e554aa2ce340e853be1006e1f411f89f09d (diff) | |
| download | mariadb-git-70cb41a240268ace3d6a8a75c28b7d9ae2a04079.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/31177/51-31177
client/mysql.cc:
Auto merged
mysql-test/r/index_merge_myisam.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/ps.result')
| -rw-r--r-- | mysql-test/r/ps.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 9d0906ad5e7..9996471076c 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -807,6 +807,8 @@ select @@max_prepared_stmt_count; @@max_prepared_stmt_count 0 set global max_prepared_stmt_count=10000000000000000; +Warnings: +Warning 1292 Truncated incorrect max_prepared_stmt_count value: '10000000000000000' select @@max_prepared_stmt_count; @@max_prepared_stmt_count 1048576 |