diff options
| author | heikki@donna.mysql.fi <> | 2001-07-20 20:58:58 +0300 |
|---|---|---|
| committer | heikki@donna.mysql.fi <> | 2001-07-20 20:58:58 +0300 |
| commit | cc35360696ceffcb4d11325587f8c6c2509a50d2 (patch) | |
| tree | 634cddc99b05bb8539a422f8f6670f9bcf9706b6 /innobase | |
| parent | 20d0a09002688b3be490665b02293123abf0a8b7 (diff) | |
| download | mariadb-git-cc35360696ceffcb4d11325587f8c6c2509a50d2.tar.gz | |
row0sel.c Remove a possible cause of the Peter Zaitsev hang
Diffstat (limited to 'innobase')
| -rw-r--r-- | innobase/row/row0sel.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index eef60c07af3..5a77fc5daaa 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -2537,10 +2537,7 @@ row_search_for_mysql( unique_search_from_clust_index = TRUE; - /* Disable this optimization (hence FALSE below) until - the hang of Peter Zaitsev has been tracked down */ - - if (FALSE && trx->mysql_n_tables_locked == 0 + if (trx->mysql_n_tables_locked == 0 && !prebuilt->sql_stat_start) { /* This is a SELECT query done as a consistent read, @@ -2576,6 +2573,12 @@ row_search_for_mysql( return(DB_RECORD_NOT_FOUND); } + + /* Commit the mini-transaction since it can + hold latches */ + + mtr_commit(&mtr); + mtr_start(&mtr); } } |