diff options
| author | unknown <monty@mysql.com> | 2005-01-06 16:59:29 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-06 16:59:29 +0200 |
| commit | 615cd4ff75a848f2fcda88b60052082d6ec9d9b2 (patch) | |
| tree | 52613241dc7c0cb3ac99bd8da61be5bf2aa09faa /mysql-test | |
| parent | 8ff8867251ccfefed1785efb50e56bc80aaf7663 (diff) | |
| download | mariadb-git-615cd4ff75a848f2fcda88b60052082d6ec9d9b2.tar.gz | |
Fixed a bug in prepared statements error handling
After merge fixes
libmysql/libmysql.c:
Fixed a bug in prepared statements error handling introduced by me on a recent patch
mysql-test/r/delayed.result:
Updated results
mysql-test/t/delayed.test:
Bigger timeout needed when using --ps-protocol (don't understand why yet)
Added output of not_flushed_dealyed_rows for easier debugging
sql/sql_base.cc:
USE tables_share fix for prepared statements
sql/sql_prepare.cc:
After merge fix
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/delayed.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/delayed.test | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/r/delayed.result b/mysql-test/r/delayed.result index ceb511a7891..e9766622cf6 100644 --- a/mysql-test/r/delayed.result +++ b/mysql-test/r/delayed.result @@ -22,6 +22,9 @@ insert delayed into t1 values (null,"c"); insert delayed into t1 values (3,"d"),(null,"e"); insert delayed into t1 values (3,"this will give an","error"); ERROR 21S01: Column count doesn't match value count at row 1 +show status like 'not_flushed_delayed_rows'; +Variable_name Value +Not_flushed_delayed_rows 0 select * from t1; a b 1 b diff --git a/mysql-test/t/delayed.test b/mysql-test/t/delayed.test index 40bd7a912f3..513de990165 100644 --- a/mysql-test/t/delayed.test +++ b/mysql-test/t/delayed.test @@ -31,6 +31,8 @@ insert delayed into t1 values (null,"c"); insert delayed into t1 values (3,"d"),(null,"e"); --error 1136 insert delayed into t1 values (3,"this will give an","error"); ---sleep 2 +# 2 was not enough for --ps-protocol +--sleep 4 +show status like 'not_flushed_delayed_rows'; select * from t1; drop table t1; |