diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 12:00:23 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 12:00:23 +0200 |
commit | 909775a7623505bea1b42327c7ce592b649dcdab (patch) | |
tree | 13dc2799539d83d0d02b0f4e2d9593489eb0bf27 /sql/sql_class.h | |
parent | 39f82b4e6ebed949ba17fe4884d96471574c1da1 (diff) | |
parent | 6d06ccbe5384874877485ddc470a89217d90c88d (diff) | |
download | mariadb-git-909775a7623505bea1b42327c7ce592b649dcdab.tar.gz |
mariadb-5.5.33 merge
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index f1932cfe8c7..1d5ac115fff 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3643,7 +3643,8 @@ public: bool is_distinct, ulonglong options, const char *alias, bool bit_fields_as_long, - bool create_table); + bool create_table, + bool keep_row_order= FALSE); TMP_TABLE_PARAM *get_tmp_table_param() { return &tmp_table_param; } }; @@ -3713,7 +3714,8 @@ public: bool is_distinct, ulonglong options, const char *alias, bool bit_fields_as_long, - bool create_table); + bool create_table, + bool keep_row_order= FALSE); bool init_result_table(ulonglong select_options); int send_data(List<Item> &items); void cleanup(); |