diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-09-28 16:19:58 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-09-28 16:19:58 +0300 |
| commit | 23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (patch) | |
| tree | 96dad57dc1b9946a3cbec98473b3ec2534a455f2 /sql/sql_class.h | |
| parent | a53f3c6d3cfa50b15b1aff26bc9479eb582d8611 (diff) | |
| parent | 078e510e0a75510cd2af8aebe2f300987d10e4d2 (diff) | |
| download | mariadb-git-23af6f5942e7235a7c14a36cb8dd0d2796b5ef37.tar.gz | |
Merge branch '10.0' of github.com:MariaDB/server into 10.0
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index f56ffbc1cc3..f52a2cd5999 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1182,7 +1182,8 @@ enum enum_locked_tables_mode LTM_NONE= 0, LTM_LOCK_TABLES, LTM_PRELOCKED, - LTM_PRELOCKED_UNDER_LOCK_TABLES + LTM_PRELOCKED_UNDER_LOCK_TABLES, + LTM_always_last }; @@ -4302,6 +4303,11 @@ public: save_copy_field_end= copy_field_end= NULL; } } + void free_copy_field_data() + { + for (Copy_field *ptr= copy_field ; ptr != copy_field_end ; ptr++) + ptr->tmp.free(); + } }; class select_union :public select_result_interceptor |