[Commits] Rev 2897: Merge XtraDB from Percona server 5.1.49-12 into MariaDB. in http://bazaar.launchpad.net/~maria-captains/maria/5.1

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Fri Sep 3 20:43:01 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1

------------------------------------------------------------
revno: 2897 [merge]
revision-id: knielsen at knielsen-hq.org-20100903174254-w77tw2pq7vfv5q6m
parent: monty at askmonty.org-20100830132523-n531bftk0q1dpby6
parent: knielsen at knielsen-hq.org-20100903154157-a6ah9wi9p3n5cqy8
committer: knielsen at knielsen-hq.org
branch nick: work-5.1-release
timestamp: Fri 2010-09-03 19:42:54 +0200
message:
  Merge XtraDB from Percona server 5.1.49-12 into MariaDB.
removed:
  storage/xtradb/ut/ut0auxconf_atomic_pthread_t_gcc.c ut0auxconf_atomic_pt-20090923000535-ke95wdd4zn27df71-20
  storage/xtradb/ut/ut0auxconf_atomic_pthread_t_solaris.c ut0auxconf_atomic_pt-20090923000535-ke95wdd4zn27df71-21
  storage/xtradb/ut/ut0auxconf_have_gcc_atomics.c ut0auxconf_have_gcc_-20100106115838-xm7yncpgr8fsekjt-16
  storage/xtradb/ut/ut0auxconf_have_solaris_atomics.c ut0auxconf_have_sola-20090923000535-ke95wdd4zn27df71-22
  storage/xtradb/ut/ut0auxconf_pause.c ut0auxconf_pause.c-20090923000535-ke95wdd4zn27df71-23
  storage/xtradb/ut/ut0auxconf_sizeof_pthread_t.c ut0auxconf_sizeof_pt-20090923000535-ke95wdd4zn27df71-24
added:
  mysql-test/include/percona_query_response_time_flush.inc percona_query_respon-20100903154151-yxesttw2yamykc72-16
  mysql-test/include/percona_query_response_time_show.inc percona_query_respon-20100903154151-yxesttw2yamykc72-17
  mysql-test/include/percona_query_response_time_sleep.inc percona_query_respon-20100903154151-yxesttw2yamykc72-18
  mysql-test/suite/percona/percona_innodb_buffer_pool_shm-master.opt percona_innodb_buffe-20100903154151-yxesttw2yamykc72-1
  mysql-test/suite/percona/percona_innodb_buffer_pool_shm.result percona_innodb_buffe-20100903154151-yxesttw2yamykc72-2
  mysql-test/suite/percona/percona_innodb_buffer_pool_shm.test percona_innodb_buffe-20100903154151-yxesttw2yamykc72-3
  mysql-test/suite/percona/percona_innodb_use_sys_stats_table-master.opt percona_innodb_use_s-20100903154151-yxesttw2yamykc72-4
  mysql-test/suite/percona/percona_innodb_use_sys_stats_table.result percona_innodb_use_s-20100903154151-yxesttw2yamykc72-5
  mysql-test/suite/percona/percona_innodb_use_sys_stats_table.test percona_innodb_use_s-20100903154151-yxesttw2yamykc72-6
  mysql-test/suite/percona/percona_log_connection_error-master.opt percona_log_connecti-20100903154151-yxesttw2yamykc72-7
  mysql-test/suite/percona/percona_log_connection_error.result percona_log_connecti-20100903154151-yxesttw2yamykc72-8
  mysql-test/suite/percona/percona_log_connection_error.test percona_log_connecti-20100903154151-yxesttw2yamykc72-9
  mysql-test/suite/percona/percona_query_response_time-replication.result percona_query_respon-20100903154151-yxesttw2yamykc72-10
  mysql-test/suite/percona/percona_query_response_time-replication.test percona_query_respon-20100903154151-yxesttw2yamykc72-11
  mysql-test/suite/percona/percona_query_response_time-stored.result percona_query_respon-20100903154151-yxesttw2yamykc72-12
  mysql-test/suite/percona/percona_query_response_time-stored.test percona_query_respon-20100903154151-yxesttw2yamykc72-13
  mysql-test/suite/percona/percona_query_response_time.result percona_query_respon-20100903154151-yxesttw2yamykc72-14
  mysql-test/suite/percona/percona_query_response_time.test percona_query_respon-20100903154151-yxesttw2yamykc72-15
  mysql-test/suite/percona/percona_server_variables.result percona_server_varia-20100903154151-yxesttw2yamykc72-19
  mysql-test/suite/percona/percona_server_variables.test percona_server_varia-20100903154151-yxesttw2yamykc72-20
  mysql-test/suite/percona/percona_slave_innodb_stats-master.opt percona_slave_innodb-20100903154151-yxesttw2yamykc72-21
  mysql-test/suite/percona/percona_slave_innodb_stats-slave.opt percona_slave_innodb-20100903154151-yxesttw2yamykc72-22
  mysql-test/suite/percona/percona_slave_innodb_stats.result percona_slave_innodb-20100903154151-yxesttw2yamykc72-23
  mysql-test/suite/percona/percona_slave_innodb_stats.test percona_slave_innodb-20100903154151-yxesttw2yamykc72-24
  mysql-test/suite/percona/percona_sql_no_fcache.result percona_sql_no_fcach-20100903154151-yxesttw2yamykc72-25
  mysql-test/suite/percona/percona_sql_no_fcache.test percona_sql_no_fcach-20100903154151-yxesttw2yamykc72-26
  mysql-test/suite/percona/percona_status_wait_query_cache_mutex.result percona_status_wait_-20100903154151-yxesttw2yamykc72-27
  mysql-test/suite/percona/percona_status_wait_query_cache_mutex.test percona_status_wait_-20100903154151-yxesttw2yamykc72-28
modified:
  mysql-test/r/information_schema.result sp1f-information_schema.r-20041113105544-waoxa2fjjsicturpothmjmi6jc3yrovn
  mysql-test/r/information_schema_all_engines.result information_schema_a-20090408133348-au36idguotknighe-2
  mysql-test/suite/percona/disabled.def disabled.def-20100803144554-xgtmbetnw2bc5lqy-1
  mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.result percona_slow_query_l-20100803104749-2zyl6a1rrwbkx3by-53
  mysql-test/suite/percona/percona_slow_query_log-use_global_long_query_time.test percona_slow_query_l-20100803104749-2zyl6a1rrwbkx3by-54
  mysql-test/suite/percona/percona_xtradb_bug317074.test percona_xtradb_bug31-20100803104749-2zyl6a1rrwbkx3by-61
  storage/xtradb/ChangeLog       changelog-20081201061010-zymrrwrczns2vrex-3
  storage/xtradb/btr/btr0btr.c   btr0btr.c-20081201061010-zymrrwrczns2vrex-44
  storage/xtradb/btr/btr0cur.c   btr0cur.c-20081201061010-zymrrwrczns2vrex-45
  storage/xtradb/btr/btr0sea.c   btr0sea.c-20081201061010-zymrrwrczns2vrex-47
  storage/xtradb/buf/buf0buddy.c buf0buddy.c-20081201061010-zymrrwrczns2vrex-48
  storage/xtradb/buf/buf0buf.c   buf0buf.c-20081201061010-zymrrwrczns2vrex-49
  storage/xtradb/buf/buf0flu.c   buf0flu.c-20081201061010-zymrrwrczns2vrex-50
  storage/xtradb/buf/buf0lru.c   buf0lru.c-20081201061010-zymrrwrczns2vrex-51
  storage/xtradb/dict/dict0boot.c dict0boot.c-20081201061010-zymrrwrczns2vrex-55
  storage/xtradb/dict/dict0crea.c dict0crea.c-20081201061010-zymrrwrczns2vrex-56
  storage/xtradb/dict/dict0dict.c dict0dict.c-20081201061010-zymrrwrczns2vrex-57
  storage/xtradb/dict/dict0load.c dict0load.c-20081201061010-zymrrwrczns2vrex-58
  storage/xtradb/dict/dict0mem.c dict0mem.c-20081201061010-zymrrwrczns2vrex-59
  storage/xtradb/fil/fil0fil.c   fil0fil.c-20081201061010-zymrrwrczns2vrex-63
  storage/xtradb/ha/hash0hash.c  hash0hash.c-20081201061010-zymrrwrczns2vrex-69
  storage/xtradb/handler/ha_innodb.cc ha_innodb.cc-20081201061010-zymrrwrczns2vrex-70
  storage/xtradb/handler/ha_innodb.h ha_innodb.h-20081201061010-zymrrwrczns2vrex-71
  storage/xtradb/handler/handler0alter.cc handler0alter.cc-20081201061010-zymrrwrczns2vrex-72
  storage/xtradb/handler/i_s.cc  i_s.cc-20081201061010-zymrrwrczns2vrex-73
  storage/xtradb/handler/i_s.h   i_s.h-20081201061010-zymrrwrczns2vrex-74
  storage/xtradb/handler/innodb_patch_info.h innodb_patch_info.h-20081206234022-hep6ryfeacyr0572-1
  storage/xtradb/include/buf0buf.h buf0buf.h-20081201061010-zymrrwrczns2vrex-88
  storage/xtradb/include/buf0lru.h buf0lru.h-20081201061010-zymrrwrczns2vrex-92
  storage/xtradb/include/buf0rea.h buf0rea.h-20081201061010-zymrrwrczns2vrex-94
  storage/xtradb/include/db0err.h db0err.h-20081201061010-zymrrwrczns2vrex-101
  storage/xtradb/include/dict0boot.h dict0boot.h-20081201061010-zymrrwrczns2vrex-102
  storage/xtradb/include/dict0crea.h dict0crea.h-20081201061010-zymrrwrczns2vrex-104
  storage/xtradb/include/dict0dict.h dict0dict.h-20081201061010-zymrrwrczns2vrex-106
  storage/xtradb/include/dict0mem.h dict0mem.h-20081201061010-zymrrwrczns2vrex-110
  storage/xtradb/include/fil0fil.h fil0fil.h-20081201061010-zymrrwrczns2vrex-119
  storage/xtradb/include/ha_prototypes.h ha_prototypes.h-20081201061010-zymrrwrczns2vrex-130
  storage/xtradb/include/hash0hash.h hash0hash.h-20081201061010-zymrrwrczns2vrex-132
  storage/xtradb/include/lock0lock.h lock0lock.h-20081201061010-zymrrwrczns2vrex-138
  storage/xtradb/include/log0log.ic log0log.ic-20081201061010-zymrrwrczns2vrex-144
  storage/xtradb/include/mach0data.ic mach0data.ic-20081201061010-zymrrwrczns2vrex-148
  storage/xtradb/include/mtr0log.ic mtr0log.ic-20081201061010-zymrrwrczns2vrex-156
  storage/xtradb/include/os0proc.h os0proc.h-20081201061010-zymrrwrczns2vrex-162
  storage/xtradb/include/page0page.h page0page.h-20081201061010-zymrrwrczns2vrex-170
  storage/xtradb/include/page0page.ic page0page.ic-20081201061010-zymrrwrczns2vrex-171
  storage/xtradb/include/page0zip.h page0zip.h-20081201061010-zymrrwrczns2vrex-173
  storage/xtradb/include/que0que.h que0que.h-20081201061010-zymrrwrczns2vrex-183
  storage/xtradb/include/rem0cmp.h rem0cmp.h-20081201061010-zymrrwrczns2vrex-189
  storage/xtradb/include/row0mysql.h row0mysql.h-20081201061010-zymrrwrczns2vrex-199
  storage/xtradb/include/srv0srv.h srv0srv.h-20081201061010-zymrrwrczns2vrex-219
  storage/xtradb/include/sync0rw.h sync0rw.h-20081201061010-zymrrwrczns2vrex-224
  storage/xtradb/include/sync0sync.h sync0sync.h-20081201061010-zymrrwrczns2vrex-226
  storage/xtradb/include/trx0sys.h trx0sys.h-20081201061010-zymrrwrczns2vrex-240
  storage/xtradb/include/trx0trx.h trx0trx.h-20081201061010-zymrrwrczns2vrex-242
  storage/xtradb/include/univ.i  univ.i-20081201061010-zymrrwrczns2vrex-248
  storage/xtradb/include/ut0lst.h ut0lst.h-20081201061010-zymrrwrczns2vrex-257
  storage/xtradb/lock/lock0lock.c lock0lock.c-20081201061010-zymrrwrczns2vrex-269
  storage/xtradb/log/log0log.c   log0log.c-20081201061010-zymrrwrczns2vrex-270
  storage/xtradb/log/log0recv.c  log0recv.c-20081201061010-zymrrwrczns2vrex-271
  storage/xtradb/os/os0file.c    os0file.c-20081201061010-zymrrwrczns2vrex-313
  storage/xtradb/os/os0proc.c    os0proc.c-20081201061010-zymrrwrczns2vrex-314
  storage/xtradb/page/page0zip.c page0zip.c-20081201061010-zymrrwrczns2vrex-319
  storage/xtradb/que/que0que.c   que0que.c-20081201061010-zymrrwrczns2vrex-329
  storage/xtradb/rem/rem0cmp.c   rem0cmp.c-20081201061010-zymrrwrczns2vrex-331
  storage/xtradb/row/row0ins.c   row0ins.c-20081201061010-zymrrwrczns2vrex-334
  storage/xtradb/row/row0merge.c row0merge.c-20081201061010-zymrrwrczns2vrex-335
  storage/xtradb/row/row0mysql.c row0mysql.c-20081201061010-zymrrwrczns2vrex-336
  storage/xtradb/row/row0purge.c row0purge.c-20081201061010-zymrrwrczns2vrex-337
  storage/xtradb/row/row0sel.c   row0sel.c-20081201061010-zymrrwrczns2vrex-339
  storage/xtradb/row/row0uins.c  row0uins.c-20081201061010-zymrrwrczns2vrex-340
  storage/xtradb/row/row0umod.c  row0umod.c-20081201061010-zymrrwrczns2vrex-341
  storage/xtradb/row/row0undo.c  row0undo.c-20081201061010-zymrrwrczns2vrex-342
  storage/xtradb/row/row0upd.c   row0upd.c-20081201061010-zymrrwrczns2vrex-343
  storage/xtradb/srv/srv0srv.c   srv0srv.c-20081201061010-zymrrwrczns2vrex-347
  storage/xtradb/srv/srv0start.c srv0start.c-20081201061010-zymrrwrczns2vrex-348
  storage/xtradb/sync/sync0arr.c sync0arr.c-20081201061010-zymrrwrczns2vrex-349
  storage/xtradb/sync/sync0rw.c  sync0rw.c-20081201061010-zymrrwrczns2vrex-350
  storage/xtradb/sync/sync0sync.c sync0sync.c-20081201061010-zymrrwrczns2vrex-351
  storage/xtradb/trx/trx0i_s.c   trx0i_s.c-20081201061010-zymrrwrczns2vrex-353
  storage/xtradb/trx/trx0purge.c trx0purge.c-20081201061010-zymrrwrczns2vrex-354
  storage/xtradb/trx/trx0sys.c   trx0sys.c-20081201061010-zymrrwrczns2vrex-358
  storage/xtradb/trx/trx0trx.c   trx0trx.c-20081201061010-zymrrwrczns2vrex-359

Diff too large for email (9689 lines, the limit is 2000).


More information about the commits mailing list