mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/include
History
marko 076550285b branches/innodb+: Merge revisions 6364:6447 from branches/zip: 
------------------------------------------------------------------------
  r6367 | marko | 2009-12-28 15:39:19 +0200 (Mon, 28 Dec 2009) | 2 lines
  Changed paths:
     M /branches/zip/dict/dict0dict.c

  branches/zip: dict_index_add_to_cache(): Always free the index object,
  also when returning DB_CORRUPTION.
  ------------------------------------------------------------------------
  r6425 | marko | 2010-01-12 13:47:11 +0200 (Tue, 12 Jan 2010) | 45 lines
  Changed paths:
     M /branches/zip/ChangeLog
     M /branches/zip/handler/ha_innodb.cc
     M /branches/zip/handler/ha_innodb.h
     M /branches/zip/row/row0mysql.c

  branches/zip: Merge revisions 6350:6424 from branches/5.1:

    ------------------------------------------------------------------------
    r6421 | jyang | 2010-01-12 07:59:16 +0200 (Tue, 12 Jan 2010) | 8 lines
    Changed paths:
       M /branches/5.1/row/row0mysql.c

    branches/5.1: Fix bug #49238: Creating/Dropping a temporary table
    while at 1023 transactions will cause assert. Handle possible
    DB_TOO_MANY_CONCURRENT_TRXS when deleting metadata in
    row_drop_table_for_mysql().

    rb://220, approved by Marko
    ------------------------------------------------------------------------
    r6422 | marko | 2010-01-12 11:34:27 +0200 (Tue, 12 Jan 2010) | 3 lines
    Changed paths:
       M /branches/5.1/handler/ha_innodb.cc
       M /branches/5.1/handler/ha_innodb.h

    branches/5.1: Non-functional change:
    Make innobase_get_int_col_max_value() a static function.
    It does not access any fields of class ha_innobase.
    ------------------------------------------------------------------------
    r6424 | marko | 2010-01-12 12:22:19 +0200 (Tue, 12 Jan 2010) | 16 lines
    Changed paths:
       M /branches/5.1/handler/ha_innodb.cc
       M /branches/5.1/handler/ha_innodb.h

    branches/5.1: In innobase_initialize_autoinc(), do not attempt to read
    the maximum auto-increment value from the table if
    innodb_force_recovery is set to at least 4, so that writes are
    disabled. (Bug #46193)

    innobase_get_int_col_max_value(): Move the function definition before
    ha_innobase::innobase_initialize_autoinc(), because that function now
    calls this function.

    ha_innobase::innobase_initialize_autoinc(): Change the return type to
    void.  Do not attempt to read the maximum auto-increment value from
    the table if innodb_force_recovery is set to at least 4.  Issue
    ER_AUTOINC_READ_FAILED to the client when the auto-increment value
    cannot be read.

    rb://144 by Sunny, revised by Marko
    ------------------------------------------------------------------------
  ------------------------------------------------------------------------
  r6426 | marko | 2010-01-12 15:36:14 +0200 (Tue, 12 Jan 2010) | 2 lines
  Changed paths:
     M /branches/zip/row/row0sel.c

  branches/zip: row_sel_sec_rec_is_for_clust_rec(): Document the return value
  more accurately.
  ------------------------------------------------------------------------
  r6433 | marko | 2010-01-13 13:19:00 +0200 (Wed, 13 Jan 2010) | 2 lines
  Changed paths:
     M /branches/zip/dict/dict0crea.c
     M /branches/zip/dict/dict0load.c

  branches/zip: dict_sys_tables_get_flags(), dict_create_sys_*_tuple():
  Add some const qualifiers and comments.
  ------------------------------------------------------------------------
  r6445 | marko | 2010-01-13 17:15:29 +0200 (Wed, 13 Jan 2010) | 3 lines
  Changed paths:
     M /branches/zip/ChangeLog
     M /branches/zip/buf/buf0buf.c

  branches/zip: buf_pool_drop_hash_index(): Check block->page.state
  before checking block->is_hashed, because the latter may be uninitialized
  right after server startup.
  ------------------------------------------------------------------------
  r6446 | marko | 2010-01-13 17:20:10 +0200 (Wed, 13 Jan 2010) | 3 lines
  Changed paths:
     M /branches/zip/include/mem0dbg.h
     M /branches/zip/include/mem0dbg.ic
     M /branches/zip/mem/mem0dbg.c
     M /branches/zip/sync/sync0sync.c

  branches/zip: Treat mem_hash_mutex specially in mutex_free(),
  and explicitly free mem_hash_mutex in mem_close().
  This fixes the breakage of UNIV_MEM_DEBUG that was filed as Issue #434.
  ------------------------------------------------------------------------
  r6447 | marko | 2010-01-13 17:43:44 +0200 (Wed, 13 Jan 2010) | 5 lines
  Changed paths:
     M /branches/zip/ChangeLog
     M /branches/zip/row/row0sel.c

  branches/zip: row_sel_get_clust_rec_for_mysql(): On the READ UNCOMMITTED
  isolation level, do not attempt to access a clustered index record
  that has been marked for deletion.  This fixes Issue #433.

  Approved by Heikki over the IM.
  ------------------------------------------------------------------------
2010-01-13 20:01:10 +00:00
..
btr0btr.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
btr0btr.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
btr0cur.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
btr0cur.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
btr0pcur.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
btr0pcur.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
btr0sea.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
btr0sea.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
btr0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
buf0buddy.h branches/innodb+: Merge revisions 5144:5524 from branches/zip 2009-07-21 00:09:29 +00:00
buf0buddy.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
buf0buf.h branches/innodb+ rb://210 2009-12-17 14:38:05 +00:00
buf0buf.ic branches/innodb+ rb://210 2009-12-17 14:38:05 +00:00
buf0flu.h branches/innodb+: Merge revisions 5144:5524 from branches/zip 2009-07-21 00:09:29 +00:00
buf0flu.ic branches/innodb+ rb://210 2009-12-17 14:38:05 +00:00
buf0lru.h branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
buf0lru.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
buf0rea.h branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
buf0types.h branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
data0data.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
data0data.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
data0type.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
data0type.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
data0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
db0err.h branches/innodb+: Merge revisions 6130:6364 from branches/zip: 2009-12-26 19:17:43 +00:00
dict0boot.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
dict0boot.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
dict0crea.h branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
dict0crea.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
dict0dict.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
dict0dict.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
dict0load.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
dict0load.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
dict0mem.h branches/innodb+: Merge revisions 6130:6364 from branches/zip: 2009-12-26 19:17:43 +00:00
dict0mem.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
dict0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
dyn0dyn.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
dyn0dyn.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
eval0eval.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
eval0eval.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
eval0proc.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
eval0proc.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
fil0fil.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
fsp0fsp.h branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
fsp0fsp.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
fsp0types.h branches/innodb+: Merge revisions 5144:5524 from branches/zip 2009-07-21 00:09:29 +00:00
fut0fut.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
fut0fut.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
fut0lst.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
fut0lst.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ha0ha.h branches/innodb+: Merge revisions 5144:5524 from branches/zip 2009-07-21 00:09:29 +00:00
ha0ha.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ha0storage.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ha0storage.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ha_prototypes.h branches/innodb+: Merge revisions 6130:6364 from branches/zip: 2009-12-26 19:17:43 +00:00
handler0alter.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
hash0hash.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
hash0hash.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ibuf0ibuf.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
ibuf0ibuf.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ibuf0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
lock0iter.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
lock0lock.h branches/innodb+: Merge revisions 6130:6364 from branches/zip: 2009-12-26 19:17:43 +00:00
lock0lock.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
lock0priv.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
lock0priv.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
lock0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
log0log.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
log0log.ic branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
log0recv.h branches/innodb+: Merge revisions 6130:6364 from branches/zip: 2009-12-26 19:17:43 +00:00
log0recv.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
mach0data.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
mach0data.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
mem0dbg.h branches/innodb+: Merge revisions 6364:6447 from branches/zip: 2010-01-13 20:01:10 +00:00
mem0dbg.ic branches/innodb+: Merge revisions 6364:6447 from branches/zip: 2010-01-13 20:01:10 +00:00
mem0mem.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
mem0mem.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
mem0pool.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
mem0pool.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
mtr0log.h branches/innodb+: Merge revisions 5144:5524 from branches/zip 2009-07-21 00:09:29 +00:00
mtr0log.ic branches/innodb+: Merge revisions 5144:5524 from branches/zip 2009-07-21 00:09:29 +00:00
mtr0mtr.h branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
mtr0mtr.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
mtr0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
mysql_addons.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
os0file.h branches/innodb+: Merge revisions 6130:6364 from branches/zip: 2009-12-26 19:17:43 +00:00
os0proc.h branches/innodb+: Merge revisions 5144:5524 from branches/zip 2009-07-21 00:09:29 +00:00
os0proc.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
os0sync.h branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
os0sync.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
os0thread.h branches/innodb+: Merge revisions 5144:5524 from branches/zip 2009-07-21 00:09:29 +00:00
os0thread.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
page0cur.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
page0cur.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
page0page.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
page0page.ic branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
page0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
page0zip.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
page0zip.ic branches/innodb+: Merge revisions 5144:5524 from branches/zip 2009-07-21 00:09:29 +00:00
pars0grm.h branches/innodb+: Merge revisions 4150:4528 from branches/zip: 2009-03-24 08:32:21 +00:00
pars0opt.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
pars0opt.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
pars0pars.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
pars0pars.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
pars0sym.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
pars0sym.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
pars0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
que0que.h branches/innodb+: Merge revisions 5144:5524 from branches/zip 2009-07-21 00:09:29 +00:00
que0que.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
que0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
read0read.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
read0read.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
read0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
rem0cmp.h branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
rem0cmp.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
rem0rec.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
rem0rec.ic branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
rem0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0ext.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0ext.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0ins.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
row0ins.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0merge.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0mysql.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
row0mysql.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0purge.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0purge.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0row.h branches/innodb+: Merge revisions 5144:5524 from branches/zip 2009-07-21 00:09:29 +00:00
row0row.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0sel.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0sel.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0uins.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0uins.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0umod.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0umod.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0undo.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0undo.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0upd.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0upd.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0vers.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
row0vers.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
srv0que.h branches/innodb+: Merge revisions 5144:5524 from branches/zip 2009-07-21 00:09:29 +00:00
srv0srv.h branches/innodb+: Merge revisions 6130:6364 from branches/zip: 2009-12-26 19:17:43 +00:00
srv0srv.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
srv0start.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
sync0arr.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
sync0arr.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
sync0rw.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
sync0rw.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
sync0sync.h branches/innodb+ rb://210 2009-12-17 14:38:05 +00:00
sync0sync.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
sync0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
thr0loc.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
thr0loc.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
trx0i_s.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
trx0purge.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
trx0purge.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
trx0rec.h branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
trx0rec.ic branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
trx0roll.h branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
trx0roll.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
trx0rseg.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
trx0rseg.ic branches/innodb+: Merge revisions 5144:5524 from branches/zip 2009-07-21 00:09:29 +00:00
trx0sys.h branches/innodb+: Merge revisions 6130:6364 from branches/zip: 2009-12-26 19:17:43 +00:00
trx0sys.ic branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
trx0trx.h branches/innodb+: Merge revisions 6130:6364 from branches/zip: 2009-12-26 19:17:43 +00:00
trx0trx.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
trx0types.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
trx0undo.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
trx0undo.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
trx0xa.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
univ.i branches/innodb+: change name and version 2009-12-17 11:00:17 +00:00
usr0sess.h branches/innodb+: Merge revisions r5971:6130 from branches/zip. 2009-11-04 06:02:00 +00:00
usr0sess.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
usr0types.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ut0auxconf.h branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
ut0byte.h branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
ut0byte.ic branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
ut0dbg.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ut0list.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ut0list.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ut0lst.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ut0mem.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ut0mem.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ut0rbt.h branches/innodb+: Merge revisions 5090:5091 from branches/zip: 2009-05-25 06:46:10 +00:00
ut0rnd.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ut0rnd.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ut0sort.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ut0ut.h branches/innodb+: Merged revisions 5525:5971 from branches/zip 2009-09-28 17:34:23 +00:00
ut0ut.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ut0vec.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ut0vec.ic branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00
ut0wqueue.h branches/innodb+: Merge revisions 5091:5143 from branches/zip: 2009-05-27 09:52:16 +00:00