diff options
author | evgen@sunlight.local <> | 2006-03-30 17:14:55 +0400 |
---|---|---|
committer | evgen@sunlight.local <> | 2006-03-30 17:14:55 +0400 |
commit | eb075f2255b1135c062071dd632dcf20a8c5a45f (patch) | |
tree | f1381200f8493f09eb4e5d618305dc65a91312e0 /sql/sql_class.h | |
parent | 2618be804dc33051663434152de0ed002ab45778 (diff) | |
parent | 47f9b465649571a9aa9c9062c33d5f7c00e5325e (diff) | |
download | mariadb-git-eb075f2255b1135c062071dd632dcf20a8c5a45f.tar.gz |
Manual merge
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 6189470b88d..c1c1b9eceb3 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1829,11 +1829,12 @@ public: aggregate functions as normal functions. */ bool precomputed_group_by; + bool force_copy_fields; TMP_TABLE_PARAM() :copy_field(0), group_parts(0), group_length(0), group_null_parts(0), convert_blob_length(0), - schema_table(0), precomputed_group_by(0) + schema_table(0), precomputed_group_by(0), force_copy_fields(0) {} ~TMP_TABLE_PARAM() { |