diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-09 19:45:48 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-09 19:45:48 +0200 |
| commit | e6b0be38f9ea03b4f657b210755f6891ce2a30f0 (patch) | |
| tree | b939c86916f6ab3745286dd9e19928e0c4041f13 /mysql-test/t/union.test | |
| parent | 251a5fa97598c8f0e7e0759880503d0932ca2918 (diff) | |
| download | mariadb-git-e6b0be38f9ea03b4f657b210755f6891ce2a30f0.tar.gz | |
Bug fix for lp:732124 union + limit returns wrong result
mysql-test/r/union.result:
Added test for lp:732124
mysql-test/t/union.test:
Added test for lp:732124
sql/sp_rcontext.cc:
Updated function definition for ::send_data()
sql/sp_rcontext.h:
Updated function definition for ::send_data()
sql/sql_analyse.cc:
Test if send_data() returned an error
sql/sql_class.cc:
Updated function definition for ::send_data()
sql/sql_class.h:
Changed select_result::send_data(List<Item> &items) to return -1 in case of duplicate row that should not be counted as part of LIMIT
sql/sql_cursor.cc:
Check if send_data returned error
sql/sql_delete.cc:
Updated function definition for ::send_data()
sql/sql_insert.cc:
Updated function definition for ::send_data()
sql/sql_select.cc:
Don't count rows which send_data() tells you to ignore
sql/sql_union.cc:
Inform caller that the row should be ignored. This is the real bug fix for lp:732124
sql/sql_update.cc:
Updated function definition for ::send_data()
Diffstat (limited to 'mysql-test/t/union.test')
| -rw-r--r-- | mysql-test/t/union.test | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index c8d5ea0f8e5..34bb4afc41c 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -1155,5 +1155,13 @@ SELECT * FROM t2 UNION SELECT * FROM t2 DROP TABLE t1,t2; +# +# lp:732124 union + limit returns wrong result +# +create table t1 (a int); +insert into t1 values (10),(10),(10),(2),(3),(4),(5),(6),(7),(8),(9),(1),(10); +--sorted_result +select a from t1 where false UNION select a from t1 limit 8; +drop table t1; --echo End of 5.1 tests |