diff options
| author | Krunal Bauskar krunal.bauskar@oracle.com <Unknown> | 2013-01-14 10:57:04 +0530 |
|---|---|---|
| committer | Krunal Bauskar krunal.bauskar@oracle.com <Unknown> | 2013-01-14 10:57:04 +0530 |
| commit | 07f6a96b592ecfd321f2b6da2f0259792aee3f82 (patch) | |
| tree | 7607017ca8b054988e202471d5c6fb1b4c9b8a56 /storage | |
| parent | 0ac6c5facc17f7b963dcb16cfb7c257a7670b26d (diff) | |
| parent | 54c47527e25f7ebe8c0d995b4a9a1bea901047a9 (diff) | |
| download | mariadb-git-07f6a96b592ecfd321f2b6da2f0259792aee3f82.tar.gz | |
Merge from mysql-5.1 to mysql-5.5
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/row/row0sel.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c index b46b2eacd9d..76c1f01d63a 100644 --- a/storage/innobase/row/row0sel.c +++ b/storage/innobase/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 */ /* Maximum number of rows to prefetch; MySQL interface has another parameter */ #define SEL_MAX_N_PREFETCH 16 @@ -3918,7 +3920,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; } |