File tree Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -5802,7 +5802,8 @@ start_new_trans::start_new_trans(THD *thd)
5802
5802
mdl_savepoint= thd->mdl_context .mdl_savepoint ();
5803
5803
memcpy (old_ha_data, thd->ha_data , sizeof (old_ha_data));
5804
5804
thd->reset_n_backup_open_tables_state (&open_tables_state_backup);
5805
- bzero (thd->ha_data , sizeof (thd->ha_data ));
5805
+ for (auto &data : thd->ha_data )
5806
+ data.reset ();
5806
5807
old_transaction= thd->transaction ;
5807
5808
thd->transaction = &new_transaction;
5808
5809
new_transaction.on = 1 ;
Original file line number Diff line number Diff line change @@ -2024,6 +2024,14 @@ struct Ha_data
2024
2024
*/
2025
2025
plugin_ref lock;
2026
2026
Ha_data () :ha_ptr (NULL ) {}
2027
+
2028
+ void reset ()
2029
+ {
2030
+ ha_ptr= nullptr ;
2031
+ for (auto &info : ha_info)
2032
+ info.reset ();
2033
+ lock= nullptr ;
2034
+ }
2027
2035
};
2028
2036
2029
2037
/* *
You can’t perform that action at this time.
0 commit comments