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 /sql/sql_insert.cc | |
| 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 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 83735fd2f41..dd13f36a432 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3178,7 +3178,7 @@ select_insert::~select_insert() } -bool select_insert::send_data(List<Item> &values) +int select_insert::send_data(List<Item> &values) { DBUG_ENTER("select_insert::send_data"); bool error=0; |