diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-28 17:55:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-28 17:55:28 +0200 |
| commit | 66d9696596edbc20ad36bf3d5bffb5595e8235c3 (patch) | |
| tree | bbef37c9a90b63d25bee59386cac04298a13846f /sql/sql_class.h | |
| parent | 66a58f46e937cdc3d7e0529b52ad8b658d9b2cd4 (diff) | |
| parent | 23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (diff) | |
| download | mariadb-git-66d9696596edbc20ad36bf3d5bffb5595e8235c3.tar.gz | |
Merge branch '10.0' into 10.1
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 b22dc8142d8..da885c3dbac 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1262,7 +1262,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 }; @@ -4610,6 +4611,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 |