diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-06-20 15:01:28 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-06-20 15:01:28 +0400 |
| commit | 8c762965d389dcd9e74c743aaf2a89bd8c18545f (patch) | |
| tree | a266816b7b2a7e5f2266fa46b7b8627aa5543773 /sql/sql_class.h | |
| parent | 0b93b444b6c4de6b219fd3a4b3d5fa2e388dc211 (diff) | |
| parent | 584d923c3292395a2e8288adcf4795992789f27c (diff) | |
| download | mariadb-git-8c762965d389dcd9e74c743aaf2a89bd8c18545f.tar.gz | |
Merge 5.3 -> 5.5
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 5de330fe207..5b53f806ddb 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3525,7 +3525,8 @@ public: if (copy_field) /* Fix for Intel compiler */ { delete [] copy_field; - save_copy_field= copy_field= 0; + save_copy_field= copy_field= NULL; + save_copy_field_end= copy_field_end= NULL; } } }; |