diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-03 23:15:57 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-03 23:15:57 +0300 |
| commit | 69cb0a8035c495dd1208f14f13d786745602a062 (patch) | |
| tree | 41e4e023b83ebd82ab39f5c6e161a20f7fc4df61 /mysql-test | |
| parent | 7bb5169d5ed22b73e20b3ee17f9bf14ec1e938d2 (diff) | |
| parent | 4cfda7fd3b3fe10acb55eb9fbf0a5743defaab3b (diff) | |
| download | mariadb-git-69cb0a8035c495dd1208f14f13d786745602a062.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- sql/sql_select.cc
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/fulltext.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/fulltext.test | 10 |
2 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result index 4b651e270e6..d1c7e88dea7 100644 --- a/mysql-test/r/fulltext.result +++ b/mysql-test/r/fulltext.result @@ -611,4 +611,12 @@ WHERE t3.a=t1.a AND MATCH(b2) AGAINST('scargill' IN BOOLEAN MODE) count(*) 0 DROP TABLE t1,t2,t3; +# +# Bug #49445: Assertion failed: 0, file .\item_row.cc, line 55 with +# fulltext search and row op +# +CREATE TABLE t1(a CHAR(1),FULLTEXT(a)); +SELECT 1 FROM t1 WHERE MATCH(a) AGAINST ('') AND ROW(a,a) > ROW(1,1); +1 +DROP TABLE t1; End of 5.1 tests diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test index 61fa28954cf..c95bc213dec 100644 --- a/mysql-test/t/fulltext.test +++ b/mysql-test/t/fulltext.test @@ -554,4 +554,14 @@ SELECT count(*) FROM t1 WHERE DROP TABLE t1,t2,t3; +--echo # +--echo # Bug #49445: Assertion failed: 0, file .\item_row.cc, line 55 with +--echo # fulltext search and row op +--echo # + +CREATE TABLE t1(a CHAR(1),FULLTEXT(a)); +SELECT 1 FROM t1 WHERE MATCH(a) AGAINST ('') AND ROW(a,a) > ROW(1,1); +DROP TABLE t1; + + --echo End of 5.1 tests |