diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-07-12 22:20:46 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-07-12 22:20:46 +0200 |
commit | c6fdb92ca829fed893d9e7324e80b1450de16087 (patch) | |
tree | 39fbccb1aea1a6a4234fe134a419f51a23232e61 /mysql-test/r/ps_1general.result | |
parent | f12ebed0a46d3051bbc76d62a8cd73b2b572364b (diff) | |
parent | 4e19aa386493fcf0613049b47cbb9b151e2d3e8d (diff) | |
download | mariadb-git-c6fdb92ca829fed893d9e7324e80b1450de16087.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/r/ps_1general.result')
-rw-r--r-- | mysql-test/r/ps_1general.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index 9981156bc5f..a1bcf734b31 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -788,3 +788,5 @@ execute stmt1; 1 drop prepare stmt1; drop table t1; +select ?+1; +Got one of the listed errors |