diff options
| author | unknown <konstantin@mysql.com> | 2004-09-28 21:44:42 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-09-28 21:44:42 +0400 |
| commit | 22cca35841c563fa562336c2cf20202b7c0ee883 (patch) | |
| tree | a0cb0d6c032523c09c52a87da27f247f5c6fbee4 /mysql-test/include | |
| parent | 18fe537cf16c4d5bcd2eb881c7f95b0d79f64d82 (diff) | |
| download | mariadb-git-22cca35841c563fa562336c2cf20202b7c0ee883.tar.gz | |
Some of the recently pushed prepared statements
tests were disabled due to failures caused by floating point conversion
issues on optimized builds).
mysql-test/include/ps_conv.inc:
Disable some of the tests for the test suite to pass on an optimized
build (floating point issues...).
mysql-test/include/ps_query.inc:
Disable some of the tests for the test suite to pass on an optimized
build (floating point issues...).
mysql-test/r/ps_2myisam.result:
Fix test results.
mysql-test/r/ps_3innodb.result:
Fix test results.
mysql-test/r/ps_4heap.result:
Fix test results.
mysql-test/r/ps_5merge.result:
Fix test results.
mysql-test/r/ps_6bdb.result:
Fix test results.
mysql-test/r/ps_7ndb.result:
Fix test results.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/ps_conv.inc | 8 | ||||
| -rw-r--r-- | mysql-test/include/ps_query.inc | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/mysql-test/include/ps_conv.inc b/mysql-test/include/ps_conv.inc index f61fb7db1c9..03d93b6190d 100644 --- a/mysql-test/include/ps_conv.inc +++ b/mysql-test/include/ps_conv.inc @@ -1190,13 +1190,13 @@ execute stmt1 using @arg00 ; ######## SELECT .. WHERE column(year)=value(DOUBLE(m,n)/DOUBLE) ######## set @arg00= 1.991e+3 ; select 'true' as found from t9 -where c1= 20 and c17= 1.991e+3 ; +where c1= 20 and abs(c17 - 1.991e+3) < 0.01 ; select 'true' as found from t9 -where c1= 20 and c17= @arg00 ; +where c1= 20 and abs(c17 - @arg00) < 0.01 ; prepare stmt1 from "select 'true' as found from t9 -where c1= 20 and c17= 1.991e+3" ; +where c1= 20 and abs(c17 - 1.991e+3) < 0.01" ; execute stmt1 ; prepare stmt1 from "select 'true' as found from t9 -where c1= 20 and c17= ?" ; +where c1= 20 and abs(c17 - ?) < 0.01" ; execute stmt1 using @arg00 ; diff --git a/mysql-test/include/ps_query.inc b/mysql-test/include/ps_query.inc index 3ebe3c7b5a1..e02d0d5bf96 100644 --- a/mysql-test/include/ps_query.inc +++ b/mysql-test/include/ps_query.inc @@ -540,6 +540,10 @@ FROM t9, (select c25 x, c32 y from t2) tt WHERE x = c25 ' ; --enable_metadata prepare stmt1 from @stmt ; +# +# Result log was disabled upon test case failure in the optimized build. +# +--disable_result_log execute stmt1 ; --disable_metadata execute stmt1 ; @@ -588,6 +592,7 @@ execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06, --disable_metadata execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04, @arg05, @arg06, @arg07, @arg08, @arg09 ; +--enable_result_log drop table t2 ; |