Merge remote-tracking branch 'origin/5.5' into 10.0

1 files changed, 3 insertions, 2 deletions

diff --git a/sql/sql_select.h b/sql/sql_select.h
index cbad287c5e5..d51bca785a5 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -1015,7 +1015,8 @@ public:
   table_map outer_join;
   /* Bitmap of tables used in the select list items */
   table_map select_list_used_tables;
-  ha_rows  send_records,found_records,examined_rows,row_limit, select_limit;
+  ha_rows  send_records, found_records, examined_rows,
+           row_limit, select_limit, duplicate_rows;
   /**
     Used to fetch no more than given amount of rows per one
     fetch operation of server side cursor.
@@ -1281,7 +1282,7 @@ public:
     sort_and_group= 0;
     first_record= 0;
     do_send_rows= 1;
-    send_records= 0;
+    duplicate_rows= send_records= 0;
     found_records= 0;
     fetch_limit= HA_POS_ERROR;
     examined_rows= 0;