mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-04 06:05:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge MDEV-6067 from 5.2 to 5.3.

Browse source
This commit is contained in:
unknown 2014-04-11 09:38:55 +02:00
commit 65f80d4052
5 changed files with 75 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
sql/handler.h
View file

@ -1625,7 +1625,6 @@ public:
enum {NONE=0, INDEX, RND} inited;
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;
Item *pushed_idx_cond;
@ -1674,7 +1673,7 @@ public:
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), cloned(0),
locked(FALSE), implicit_emptied(FALSE), cloned(0),
pushed_cond(0), pushed_idx_cond(NULL),
pushed_idx_cond_keyno(MAX_KEY),
next_insert_id(0), insert_id_for_cur_row(0),
@ -1740,13 +1739,6 @@ public:
}
int ha_rnd_init_with_error(bool scan) __attribute__ ((warn_unused_result));
int ha_reset();
/* Tell handler (not storage engine) this is start of a new statement */
void ha_start_of_new_statement()
{
ft_handler= 0;
mark_trx_done= FALSE;
}
/* this is necessary in many places, e.g. in HANDLER command */
int ha_index_or_rnd_end()
{
@ -2459,12 +2451,8 @@ protected:
private:
/* Private helpers */
void mark_trx_read_write_part2();
inline void mark_trx_read_write()
{
if (!mark_trx_done)
mark_trx_read_write_part2();
}
inline void mark_trx_read_write();
private:
inline void increment_statistics(ulong SSV::*offset) const;
inline void decrement_statistics(ulong SSV::*offset) const;