maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Aleksandr Kuzminsky (akuzminsky)
  Kristian Nielsen (knielsen)
------------------------------------------------------------
revno: 2764 [merge]
committer: knielsen@xxxxxxxxxxxxxxx
branch nick: mariadb-5.1
timestamp: Sat 2009-11-14 13:45:36 +0100
message:
  Merge MariaDB 5.1.39 release, including XtraDB 8 merge, into MariaDB 5.1 trunk.
removed:
  mysql-test/suite/innodb/r/innodb_file_format.result
  mysql-test/suite/innodb/t/innodb_file_format.test
  storage/xtradb/ut/ut0auxconf.c
added:
  mysql-test/r/innodb_file_format.result
  mysql-test/t/innodb_file_format.test
  storage/xtradb/COPYING.Percona
  storage/xtradb/COPYING.Sun_Microsystems
  storage/xtradb/Doxyfile
  storage/xtradb/include/fsp0types.h
  storage/xtradb/ut/ut0auxconf_atomic_pthread_t_gcc.c
  storage/xtradb/ut/ut0auxconf_atomic_pthread_t_solaris.c
  storage/xtradb/ut/ut0auxconf_have_solaris_atomics.c
  storage/xtradb/ut/ut0auxconf_pause.c
  storage/xtradb/ut/ut0auxconf_sizeof_pthread_t.c
renamed:
  mysql-test/suite/innodb/r/innodb_bug44032.result => mysql-test/r/innodb_bug44032.result
  mysql-test/suite/innodb/t/innodb_bug44032.test => mysql-test/t/innodb_bug44032.test
modified:
  configure.in
  mysql-test/include/index_merge2.inc
  mysql-test/r/index_merge_innodb.result
  mysql-test/r/index_merge_myisam.result
  mysql-test/r/innodb-autoinc.result
  mysql-test/r/innodb-index.result
  mysql-test/r/innodb.result
  mysql-test/r/innodb_bug36169.result
  mysql-test/t/innodb-autoinc.test
  mysql-test/t/innodb-index.test
  mysql-test/t/innodb.test
  mysql-test/t/innodb_bug36169.test
  mysql-test/t/innodb_bug36172.test
  storage/federatedx/Makefile.am
  storage/federatedx/ha_federatedx.cc
  storage/xtradb/CMakeLists.txt
  storage/xtradb/ChangeLog
  storage/xtradb/Makefile.am
  storage/xtradb/btr/btr0btr.c
  storage/xtradb/btr/btr0cur.c
  storage/xtradb/btr/btr0pcur.c
  storage/xtradb/btr/btr0sea.c
  storage/xtradb/buf/buf0buddy.c
  storage/xtradb/buf/buf0buf.c
  storage/xtradb/buf/buf0flu.c
  storage/xtradb/buf/buf0lru.c
  storage/xtradb/buf/buf0rea.c
  storage/xtradb/data/data0data.c
  storage/xtradb/data/data0type.c
  storage/xtradb/dict/dict0boot.c
  storage/xtradb/dict/dict0crea.c
  storage/xtradb/dict/dict0dict.c
  storage/xtradb/dict/dict0load.c
  storage/xtradb/dict/dict0mem.c
  storage/xtradb/dyn/dyn0dyn.c
  storage/xtradb/eval/eval0eval.c
  storage/xtradb/eval/eval0proc.c
  storage/xtradb/fil/fil0fil.c
  storage/xtradb/fsp/fsp0fsp.c
  storage/xtradb/fut/fut0fut.c
  storage/xtradb/fut/fut0lst.c
  storage/xtradb/ha/ha0ha.c
  storage/xtradb/ha/ha0storage.c
  storage/xtradb/ha/hash0hash.c
  storage/xtradb/handler/ha_innodb.cc
  storage/xtradb/handler/ha_innodb.h
  storage/xtradb/handler/handler0alter.cc
  storage/xtradb/handler/handler0vars.h
  storage/xtradb/handler/i_s.cc
  storage/xtradb/handler/i_s.h
  storage/xtradb/handler/innodb_patch_info.h
  storage/xtradb/handler/mysql_addons.cc
  storage/xtradb/handler/win_delay_loader.cc
  storage/xtradb/ibuf/ibuf0ibuf.c
  storage/xtradb/include/btr0btr.h
  storage/xtradb/include/btr0btr.ic
  storage/xtradb/include/btr0cur.h
  storage/xtradb/include/btr0cur.ic
  storage/xtradb/include/btr0pcur.h
  storage/xtradb/include/btr0pcur.ic
  storage/xtradb/include/btr0sea.h
  storage/xtradb/include/btr0sea.ic
  storage/xtradb/include/btr0types.h
  storage/xtradb/include/buf0buddy.h
  storage/xtradb/include/buf0buddy.ic
  storage/xtradb/include/buf0buf.h
  storage/xtradb/include/buf0buf.ic
  storage/xtradb/include/buf0flu.h
  storage/xtradb/include/buf0flu.ic
  storage/xtradb/include/buf0lru.h
  storage/xtradb/include/buf0lru.ic
  storage/xtradb/include/buf0rea.h
  storage/xtradb/include/buf0types.h
  storage/xtradb/include/data0data.h
  storage/xtradb/include/data0data.ic
  storage/xtradb/include/data0type.h
  storage/xtradb/include/data0type.ic
  storage/xtradb/include/data0types.h
  storage/xtradb/include/db0err.h
  storage/xtradb/include/dict0boot.h
  storage/xtradb/include/dict0boot.ic
  storage/xtradb/include/dict0crea.h
  storage/xtradb/include/dict0crea.ic
  storage/xtradb/include/dict0dict.h
  storage/xtradb/include/dict0dict.ic
  storage/xtradb/include/dict0load.h
  storage/xtradb/include/dict0load.ic
  storage/xtradb/include/dict0mem.h
  storage/xtradb/include/dict0mem.ic
  storage/xtradb/include/dict0types.h
  storage/xtradb/include/dyn0dyn.h
  storage/xtradb/include/dyn0dyn.ic
  storage/xtradb/include/eval0eval.h
  storage/xtradb/include/eval0eval.ic
  storage/xtradb/include/eval0proc.h
  storage/xtradb/include/eval0proc.ic
  storage/xtradb/include/fil0fil.h
  storage/xtradb/include/fsp0fsp.h
  storage/xtradb/include/fsp0fsp.ic
  storage/xtradb/include/fut0fut.h
  storage/xtradb/include/fut0fut.ic
  storage/xtradb/include/fut0lst.h
  storage/xtradb/include/fut0lst.ic
  storage/xtradb/include/ha0ha.h
  storage/xtradb/include/ha0ha.ic
  storage/xtradb/include/ha0storage.h
  storage/xtradb/include/ha0storage.ic
  storage/xtradb/include/ha_prototypes.h
  storage/xtradb/include/handler0alter.h
  storage/xtradb/include/hash0hash.h
  storage/xtradb/include/hash0hash.ic
  storage/xtradb/include/ibuf0ibuf.h
  storage/xtradb/include/ibuf0ibuf.ic
  storage/xtradb/include/ibuf0types.h
  storage/xtradb/include/lock0iter.h
  storage/xtradb/include/lock0lock.h
  storage/xtradb/include/lock0lock.ic
  storage/xtradb/include/lock0priv.h
  storage/xtradb/include/lock0priv.ic
  storage/xtradb/include/lock0types.h
  storage/xtradb/include/log0log.h
  storage/xtradb/include/log0log.ic
  storage/xtradb/include/log0recv.h
  storage/xtradb/include/log0recv.ic
  storage/xtradb/include/mach0data.h
  storage/xtradb/include/mach0data.ic
  storage/xtradb/include/mem0dbg.h
  storage/xtradb/include/mem0dbg.ic
  storage/xtradb/include/mem0mem.h
  storage/xtradb/include/mem0mem.ic
  storage/xtradb/include/mem0pool.h
  storage/xtradb/include/mem0pool.ic
  storage/xtradb/include/mtr0log.h
  storage/xtradb/include/mtr0log.ic
  storage/xtradb/include/mtr0mtr.h
  storage/xtradb/include/mtr0mtr.ic
  storage/xtradb/include/mtr0types.h
  storage/xtradb/include/mysql_addons.h
  storage/xtradb/include/os0file.h
  storage/xtradb/include/os0proc.h
  storage/xtradb/include/os0proc.ic
  storage/xtradb/include/os0sync.h
  storage/xtradb/include/os0sync.ic
  storage/xtradb/include/os0thread.h
  storage/xtradb/include/os0thread.ic
  storage/xtradb/include/page0cur.h
  storage/xtradb/include/page0cur.ic
  storage/xtradb/include/page0page.h
  storage/xtradb/include/page0page.ic
  storage/xtradb/include/page0types.h
  storage/xtradb/include/page0zip.h
  storage/xtradb/include/page0zip.ic
  storage/xtradb/include/pars0opt.h
  storage/xtradb/include/pars0opt.ic
  storage/xtradb/include/pars0pars.h
  storage/xtradb/include/pars0pars.ic
  storage/xtradb/include/pars0sym.h
  storage/xtradb/include/pars0sym.ic
  storage/xtradb/include/pars0types.h
  storage/xtradb/include/que0que.h
  storage/xtradb/include/que0que.ic
  storage/xtradb/include/que0types.h
  storage/xtradb/include/read0read.h
  storage/xtradb/include/read0read.ic
  storage/xtradb/include/read0types.h
  storage/xtradb/include/rem0cmp.h
  storage/xtradb/include/rem0cmp.ic
  storage/xtradb/include/rem0rec.h
  storage/xtradb/include/rem0rec.ic
  storage/xtradb/include/rem0types.h
  storage/xtradb/include/row0ext.h
  storage/xtradb/include/row0ext.ic
  storage/xtradb/include/row0ins.h
  storage/xtradb/include/row0ins.ic
  storage/xtradb/include/row0merge.h
  storage/xtradb/include/row0mysql.h
  storage/xtradb/include/row0mysql.ic
  storage/xtradb/include/row0purge.h
  storage/xtradb/include/row0purge.ic
  storage/xtradb/include/row0row.h
  storage/xtradb/include/row0row.ic
  storage/xtradb/include/row0sel.h
  storage/xtradb/include/row0sel.ic
  storage/xtradb/include/row0types.h
  storage/xtradb/include/row0uins.h
  storage/xtradb/include/row0uins.ic
  storage/xtradb/include/row0umod.h
  storage/xtradb/include/row0umod.ic
  storage/xtradb/include/row0undo.h
  storage/xtradb/include/row0undo.ic
  storage/xtradb/include/row0upd.h
  storage/xtradb/include/row0upd.ic
  storage/xtradb/include/row0vers.h
  storage/xtradb/include/row0vers.ic
  storage/xtradb/include/srv0que.h
  storage/xtradb/include/srv0srv.h
  storage/xtradb/include/srv0srv.ic
  storage/xtradb/include/srv0start.h
  storage/xtradb/include/sync0arr.h
  storage/xtradb/include/sync0arr.ic
  storage/xtradb/include/sync0rw.h
  storage/xtradb/include/sync0rw.ic
  storage/xtradb/include/sync0sync.h
  storage/xtradb/include/sync0sync.ic
  storage/xtradb/include/sync0types.h
  storage/xtradb/include/thr0loc.h
  storage/xtradb/include/thr0loc.ic
  storage/xtradb/include/trx0i_s.h
  storage/xtradb/include/trx0purge.h
  storage/xtradb/include/trx0purge.ic
  storage/xtradb/include/trx0rec.h
  storage/xtradb/include/trx0rec.ic
  storage/xtradb/include/trx0roll.h
  storage/xtradb/include/trx0roll.ic
  storage/xtradb/include/trx0rseg.h
  storage/xtradb/include/trx0rseg.ic
  storage/xtradb/include/trx0sys.h
  storage/xtradb/include/trx0sys.ic
  storage/xtradb/include/trx0trx.h
  storage/xtradb/include/trx0trx.ic
  storage/xtradb/include/trx0types.h
  storage/xtradb/include/trx0undo.h
  storage/xtradb/include/trx0undo.ic
  storage/xtradb/include/trx0xa.h
  storage/xtradb/include/univ.i
  storage/xtradb/include/usr0sess.h
  storage/xtradb/include/usr0sess.ic
  storage/xtradb/include/usr0types.h
  storage/xtradb/include/ut0auxconf.h
  storage/xtradb/include/ut0byte.h
  storage/xtradb/include/ut0byte.ic
  storage/xtradb/include/ut0dbg.h
  storage/xtradb/include/ut0list.h
  storage/xtradb/include/ut0list.ic
  storage/xtradb/include/ut0lst.h
  storage/xtradb/include/ut0mem.h
  storage/xtradb/include/ut0mem.ic
  storage/xtradb/include/ut0rnd.h
  storage/xtradb/include/ut0rnd.ic
  storage/xtradb/include/ut0sort.h
  storage/xtradb/include/ut0ut.h
  storage/xtradb/include/ut0ut.ic
  storage/xtradb/include/ut0vec.h
  storage/xtradb/include/ut0vec.ic
  storage/xtradb/include/ut0wqueue.h
  storage/xtradb/lock/lock0iter.c
  storage/xtradb/lock/lock0lock.c
  storage/xtradb/log/log0log.c
  storage/xtradb/log/log0recv.c
  storage/xtradb/mach/mach0data.c
  storage/xtradb/mem/mem0dbg.c
  storage/xtradb/mem/mem0mem.c
  storage/xtradb/mem/mem0pool.c
  storage/xtradb/mtr/mtr0log.c
  storage/xtradb/mtr/mtr0mtr.c
  storage/xtradb/os/os0file.c
  storage/xtradb/os/os0proc.c
  storage/xtradb/os/os0sync.c
  storage/xtradb/os/os0thread.c
  storage/xtradb/page/page0cur.c
  storage/xtradb/page/page0page.c
  storage/xtradb/page/page0zip.c
  storage/xtradb/pars/lexyy.c
  storage/xtradb/pars/pars0lex.l
  storage/xtradb/pars/pars0opt.c
  storage/xtradb/pars/pars0pars.c
  storage/xtradb/pars/pars0sym.c
  storage/xtradb/plug.in
  storage/xtradb/que/que0que.c
  storage/xtradb/read/read0read.c
  storage/xtradb/rem/rem0cmp.c
  storage/xtradb/rem/rem0rec.c
  storage/xtradb/row/row0ext.c
  storage/xtradb/row/row0ins.c
  storage/xtradb/row/row0merge.c
  storage/xtradb/row/row0mysql.c
  storage/xtradb/row/row0purge.c
  storage/xtradb/row/row0row.c
  storage/xtradb/row/row0sel.c
  storage/xtradb/row/row0uins.c
  storage/xtradb/row/row0umod.c
  storage/xtradb/row/row0undo.c
  storage/xtradb/row/row0upd.c
  storage/xtradb/row/row0vers.c
  storage/xtradb/srv/srv0que.c
  storage/xtradb/srv/srv0srv.c
  storage/xtradb/srv/srv0start.c
  storage/xtradb/sync/sync0arr.c
  storage/xtradb/sync/sync0rw.c
  storage/xtradb/sync/sync0sync.c
  storage/xtradb/thr/thr0loc.c
  storage/xtradb/trx/trx0i_s.c
  storage/xtradb/trx/trx0purge.c
  storage/xtradb/trx/trx0rec.c
  storage/xtradb/trx/trx0roll.c
  storage/xtradb/trx/trx0rseg.c
  storage/xtradb/trx/trx0sys.c
  storage/xtradb/trx/trx0trx.c
  storage/xtradb/trx/trx0undo.c
  storage/xtradb/usr/usr0sess.c
  storage/xtradb/ut/ut0byte.c
  storage/xtradb/ut/ut0dbg.c
  storage/xtradb/ut/ut0list.c
  storage/xtradb/ut/ut0mem.c
  storage/xtradb/ut/ut0rnd.c
  storage/xtradb/ut/ut0ut.c
  storage/xtradb/ut/ut0vec.c
  storage/xtradb/ut/ut0wqueue.c
  storage/xtradb/win-plugin/README
  storage/xtradb/win-plugin/win-plugin.diff
The size of the diff (120074 lines) is larger than your specified limit of 5000 lines

--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.