diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-18 21:45:32 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-18 21:45:32 +0200 |
| commit | 2813f568b74a65d5d2ce8bbcada2c99d1a01815a (patch) | |
| tree | f952fbb67d84e7ee8fe7bf9b7d271a6bebc35c78 /mysql-test/r/myisam_icp.result | |
| parent | bbd4bb310d7b500a57be56b8f0501fa8eee6d40f (diff) | |
| parent | b12e3796dc70466eca5ef3f25d51234b32af5113 (diff) | |
| download | mariadb-git-2813f568b74a65d5d2ce8bbcada2c99d1a01815a.tar.gz | |
Merge with bugfix
sql/multi_range_read.cc:
Added printing of error if something goes wrong in get_next()
(Not critical for this bug fix, but this was something that I noticed while testing and found missing)
storage/myisam/mi_rkey.c:
Fixed wrong error number in mi_yield_and_check_if_killed()
Diffstat (limited to 'mysql-test/r/myisam_icp.result')
| -rw-r--r-- | mysql-test/r/myisam_icp.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/myisam_icp.result b/mysql-test/r/myisam_icp.result index d72ae90d230..45d45bd3452 100644 --- a/mysql-test/r/myisam_icp.result +++ b/mysql-test/r/myisam_icp.result @@ -198,3 +198,4 @@ COUNT(*) 12 DROP PROCEDURE insert_data; DROP TABLE t1, t2, t3; +drop table if exists t0, t1, t1i, t1m; |