summaryrefslogtreecommitdiff
path: root/sql/records.h
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
commit6b1d61ecb072aab0f04a4dbaa380309a92ee2b10 (patch)
tree1856f6f3743fb840ae45d1166df3bffe566031e4 /sql/records.h
parentae71ffc1c88f2e37320dee98824e6d437a083604 (diff)
parentcb0cca865587da1da071a67e0932dcfaa54a4b0c (diff)
downloadmariadb-git-6b1d61ecb072aab0f04a4dbaa380309a92ee2b10.tar.gz
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/records.h')
-rw-r--r--sql/records.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/records.h b/sql/records.h
index 9207a05f826..ae81a31ee1a 100644
--- a/sql/records.h
+++ b/sql/records.h
@@ -43,11 +43,13 @@ class SQL_SELECT;
struct READ_RECORD
{
typedef int (*Read_func)(READ_RECORD*);
+ typedef void (*Unlock_row_func)(st_join_table *);
typedef int (*Setup_func)(struct st_join_table*);
TABLE *table; /* Head-form */
handler *file;
TABLE **forms; /* head and ref forms */
+ Unlock_row_func unlock_row;
Read_func read_record;
THD *thd;
SQL_SELECT *select;
@@ -72,4 +74,6 @@ void init_read_record_idx(READ_RECORD *info, THD *thd, TABLE *table,
bool print_error, uint idx);
void end_read_record(READ_RECORD *info);
+void rr_unlock_row(st_join_table *tab);
+
#endif /* SQL_RECORDS_H */