← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/haildb/haildb_engine.h

Merge Revision revid:marko.makela@oracle.com-20100601140355-u3kxl0yl0ljl5tx9 from MySQL InnoDB

Original revid:marko.makela@oracle.com-20100601140355-u3kxl0yl0ljl5tx9

Original Authors: Marko Mäkelä <marko.makela@oracle.com>
Original commit message:
Merge a change from mysql-5.1-innodb:

  ------------------------------------------------------------
  revno: 3491
  revision-id: marko.makela@oracle.com-20100601134335-ccthwwru23kn09qw
  parent: marko.makela@oracle.com-20100601120751-1uq7bbta5n7ts0qr
  committer: Marko Mäkelä <marko.makela@oracle.com>
  branch nick: 5.1-innodb
  timestamp: Tue 2010-06-01 16:43:35 +0300
  message:
    Bug#48197: Concurrent rw_lock_free may cause assertion failure

    rw_lock_t: Remove magic_n unless UNIV_DEBUG is defined.
    rw_lock_free(): Invalidate magic_n only after removing from rw_lock_list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/haildb/haildb_engine.h
115
115
                          uint64_t *nb_reserved_values);
116
116
 
117
117
  int reset();
118
 
  int analyze(drizzled::Session* session);
119
118
 
120
119
private:
121
 
  ib_id_t table_id;
122
120
  ib_crsr_t cursor;
123
121
  ib_tpl_t tuple;
124
122
  bool advance_cursor;
125
123
  ib_lck_mode_t ib_lock_mode;
126
 
  bool cursor_is_sec_index;
 
124
  int previous_error;
127
125
 
128
126
  bool write_can_replace;
129
127
  uint64_t hidden_autoinc_pkey_position;