diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-06 15:51:07 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-06 15:51:07 +0300 |
| commit | 569c37163e0e7afb8f9da37f5d67a2b52e610146 (patch) | |
| tree | bad667053d9e1308d31c26091bbcc622a017a93f /sql/handler.h | |
| parent | 2b0d16bcd9833ce73062c555f6755b9863e92ee2 (diff) | |
| parent | 50b43cf8055819290f7155a052d52cc563928f22 (diff) | |
| download | mariadb-git-569c37163e0e7afb8f9da37f5d67a2b52e610146.tar.gz | |
Merge with MariaDB 5.1
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/handler.h b/sql/handler.h index ad4743b78b1..0306f8aec61 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1245,6 +1245,7 @@ public: bool locked; bool implicit_emptied; /* Can be !=0 only if HEAP */ bool mark_trx_done; + bool cloned; /* 1 if this was created with clone */ const COND *pushed_cond; /** next_insert_id is the next value which should be inserted into the @@ -1288,7 +1289,7 @@ public: ref(0), key_used_on_scan(MAX_KEY), active_index(MAX_KEY), ref_length(sizeof(my_off_t)), ft_handler(0), inited(NONE), - locked(FALSE), implicit_emptied(FALSE), mark_trx_done(FALSE), + locked(FALSE), implicit_emptied(FALSE), mark_trx_done(FALSE), cloned(0), pushed_cond(0), next_insert_id(0), insert_id_for_cur_row(0), auto_inc_intervals_count(0) { |