summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-12-31 12:04:35 +0200
committermonty@mysql.com <>2004-12-31 12:04:35 +0200
commit1bd22faa05c03dfb19916a92266fb5b45768d3f6 (patch)
tree15ba897ee442fcca24c0923eecba6bd94786608f /sql/sql_union.cc
parent19f3570ba8cc34fb99e1136b8662b5a0ba859958 (diff)
downloadmariadb-git-1bd22faa05c03dfb19916a92266fb5b45768d3f6.tar.gz
Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
This allows use to use INSERT IGNORE ... ON DUPLICATE ...
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index b35209faeb2..f89b234f5b0 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -45,10 +45,10 @@ select_union::select_union(TABLE *table_par)
{
bzero((char*) &info,sizeof(info));
/*
- We can always use DUP_IGNORE because the temporary table will only
+ We can always use IGNORE because the temporary table will only
contain a unique key if we are using not using UNION ALL
*/
- info.handle_duplicates= DUP_IGNORE;
+ info.ignore= 1;
}
select_union::~select_union()