diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2015-01-07 19:02:26 -0500 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2015-01-07 19:02:26 -0500 |
| commit | fa59b13a55f9a5b518336a7657b53f2da4424bed (patch) | |
| tree | 266cc4da65e5831ba3db089150f7521333cc22e3 /storage/tokudb | |
| parent | efb32d4644d4943e4e1d739a8a66e2fc6280f42e (diff) | |
| download | mariadb-git-fa59b13a55f9a5b518336a7657b53f2da4424bed.tar.gz | |
DB-781 check killed in tokudb get_next to terminate a big partition copy. should be done in partition storage engine, however
Diffstat (limited to 'storage/tokudb')
| -rw-r--r-- | storage/tokudb/ha_tokudb.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index 07046fd6340..a61e8a49230 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -5363,9 +5363,12 @@ int ha_tokudb::get_next(uchar* buf, int direction, DBT* key_to_compare, bool do_ } if (!error) { - tokudb_trx_data* trx = (tokudb_trx_data *) thd_get_ha_data(ha_thd(), tokudb_hton); + THD *thd = ha_thd(); + tokudb_trx_data* trx = (tokudb_trx_data *) thd_get_ha_data(thd, tokudb_hton); trx->stmt_progress.queried++; - track_progress(ha_thd()); + track_progress(thd); + if (thd_killed(thd)) + error = ER_ABORTING_CONNECTION; } cleanup: return error; |