summaryrefslogtreecommitdiff
path: root/sql/records.cc
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-06 19:13:33 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-06 19:13:33 +0300
commit35b00a182e8352a56d1565b7a5e4d5ca9efd8d07 (patch)
tree1856f6f3743fb840ae45d1166df3bffe566031e4 /sql/records.cc
parentf56223598ed9092f5fed6a95d80736cfdd5570db (diff)
parent409160e4668faab964892fa9a8082be4482e8dac (diff)
downloadmariadb-git-35b00a182e8352a56d1565b7a5e4d5ca9efd8d07.tar.gz
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/records.cc')
-rw-r--r--sql/records.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/records.cc b/sql/records.cc
index 93b19aefbaf..8fd63d104a4 100644
--- a/sql/records.cc
+++ b/sql/records.cc
@@ -67,6 +67,7 @@ void init_read_record_idx(READ_RECORD *info, THD *thd, TABLE *table,
info->file= table->file;
info->record= table->record[0];
info->print_error= print_error;
+ info->unlock_row= rr_unlock_row;
table->status=0; /* And it's always found */
if (!table->file->inited)
@@ -192,6 +193,7 @@ void init_read_record(READ_RECORD *info,THD *thd, TABLE *table,
}
info->select=select;
info->print_error=print_error;
+ info->unlock_row= rr_unlock_row;
info->ignore_not_found_rows= 0;
table->status=0; /* And it's always found */