diff options
| author | unknown <pem@mysql.com> | 2006-01-16 17:55:22 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2006-01-16 17:55:22 +0100 |
| commit | c5216f4eee99fa429c9ce3cdf4e8704048847ee4 (patch) | |
| tree | 1917bdb87db759733cb9d07776d6564a83f22102 /mysql-test | |
| parent | 746705da8ea30bb6e20c97c8258d1c9e71bf9215 (diff) | |
| download | mariadb-git-c5216f4eee99fa429c9ce3cdf4e8704048847ee4.tar.gz | |
Post-merge fixes (BUG#14498)
mysql-test/r/sp-code.result:
Post-merge fix; updated result.
mysql-test/t/sp.test:
Post-merge fix; added comment (still can't call bug14498_4 test)
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/sp-code.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/sp.test | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/sp-code.result b/mysql-test/r/sp-code.result index e6c4ffe1731..943471c2261 100644 --- a/mysql-test/r/sp-code.result +++ b/mysql-test/r/sp-code.result @@ -49,7 +49,7 @@ Pos Instruction 9 set err@1 1 10 hreturn 5 11 cfetch c@0 n@4 -12 jump_if_not 15 isnull(n@4) +12 jump_if_not 15(17) isnull(n@4) 13 set nulls@2 (nulls@2 + 1) 14 jump 17 15 set count@3 (count@3 + 1) diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index 7b311088090..b5751c6da63 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -5230,7 +5230,9 @@ end| call bug14498_1()| call bug14498_2()| call bug14498_3()| -# QQ We can't call this at the moment, due to a known bug (BUG#14643) +# We couldn't call this before, due to a known bug (BUG#14643) +# QQ We still can't since the new set_case_expr instruction breaks +# the semantics of case; it won't crash, but will get the wrong result. #call bug14498_4()| call bug14498_5()| |