diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-10-28 15:50:13 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-10-28 15:50:13 -0400 |
| commit | 5db2195a35c0a2ee7703ab603721b2f0987d2585 (patch) | |
| tree | 1306ce565f0f01f56dd31b2c43b1233bcb08257c /sql/sql_class.h | |
| parent | c9ded859a6fad25fc513d3a0c7d17f826e567691 (diff) | |
| parent | eca8c324e9a02f530853580991b11b587f54b24a (diff) | |
| download | mariadb-git-5db2195a35c0a2ee7703ab603721b2f0987d2585.tar.gz | |
Merge tag 'mariadb-10.0.28' into 10.0-galera
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 08f014d7f48..56ae659797c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1203,7 +1203,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 }; @@ -4373,6 +4374,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 |