diff options
| author | unknown <evgen@sunlight.local> | 2006-03-30 17:14:55 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2006-03-30 17:14:55 +0400 |
| commit | e0708e2c11b9079fbe85a36fa1790761241b262c (patch) | |
| tree | f1381200f8493f09eb4e5d618305dc65a91312e0 /sql/sql_class.h | |
| parent | b7f090e402a27b5407e059a019dcefcfec483efd (diff) | |
| parent | ff4de9050149bd1ab1727d7f226e094ddcdcd355 (diff) | |
| download | mariadb-git-e0708e2c11b9079fbe85a36fa1790761241b262c.tar.gz | |
Manual merge
myisam/mi_search.c:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
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() { |