diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-07-16 16:17:47 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-07-16 16:17:47 +0300 |
| commit | 760efb518898c7dc540b439a79da36ac25bf5a37 (patch) | |
| tree | a952ce92279ef0fe826cca74e68f5a116d23672d /sql/sql_select.h | |
| parent | 73f2c6484161ab7d060b1f6c661642f586afdd60 (diff) | |
| parent | 1a4bc9a1e429697f86f63f2599e49a4f2d29cd32 (diff) | |
| download | mariadb-git-760efb518898c7dc540b439a79da36ac25bf5a37.tar.gz | |
automerge
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 353c2b1d610..a0366d47149 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -466,7 +466,8 @@ public: group_optimized_away= 0; all_fields= fields_arg; - fields_list= fields_arg; + if (&fields_list != &fields_arg) /* Avoid valgrind-warning */ + fields_list= fields_arg; bzero((char*) &keyuse,sizeof(keyuse)); tmp_table_param.init(); tmp_table_param.end_write_records= HA_POS_ERROR; |