diff options
Diffstat (limited to 'storage/xtradb/row/row0sel.c')
| -rw-r--r-- | storage/xtradb/row/row0sel.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/storage/xtradb/row/row0sel.c b/storage/xtradb/row/row0sel.c index dec192585ce..0907b7f823f 100644 --- a/storage/xtradb/row/row0sel.c +++ b/storage/xtradb/row/row0sel.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1997, 2012, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1997, 2013, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by @@ -57,6 +57,8 @@ Created 12/19/1997 Heikki Tuuri #include "read0read.h" #include "buf0lru.h" #include "ha_prototypes.h" +#include "m_string.h" /* for my_sys.h */ +#include "my_sys.h" /* DEBUG_SYNC_C */ #include "my_compare.h" /* enum icp_result */ @@ -4127,7 +4129,9 @@ wait_table_again: } rec_loop: + DEBUG_SYNC_C("row_search_rec_loop"); if (trx_is_interrupted(trx)) { + btr_pcur_store_position(pcur, &mtr); err = DB_INTERRUPTED; goto normal_return; } @@ -5095,8 +5099,8 @@ row_search_check_if_query_cache_permitted( trx->read_view = read_view_open_now(trx->id, - NULL, TRUE); - + trx->prebuilt_view, TRUE); + trx->prebuilt_view = trx->read_view; trx->global_read_view = trx->read_view; } } |