maria-developers team mailing list archive

[Sergey Petrunya <psergey@xxxxxxxxxxxx>]

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd2/

------------------------------------------------------------
revno: 2721
revision-id: psergey@xxxxxxxxxxxx-20090908160458-fglojzacu8inqb9q
parent: psergey@xxxxxxxxxxxx-20090907205010-tnvi4bomzq2b1eut
parent: aleksandr.kuzminsky@xxxxxxxxxxx-20090810223610-ssatw3bi8t3ggr5z
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: mysql-5.1-maria-contd2
timestamp: Tue 2009-09-08 20:04:58 +0400
message:
  Merge xtradb-7 -> MariaDB
added:
  mysql-test.percona/            mysqltest-20081201061010-zymrrwrczns2vrex-27
  mysql-test/patches/            patches-20081203050234-edoolglm28lyejuc-13
  mysql-test/patches/events_stress.diff events_stress.diff-20090908160024-tii87qp66sk04a00-1
  mysql-test/patches/information_schema.diff information_schema.d-20090908160027-1rc1imife37xem2d-1
  mysql-test/patches/information_schema_db.diff information_schema_d-20090908160031-m7v1n1g41r1cfhif-1
  mysql-test/patches/mysqlshow.diff mysqlshow.diff-20090908160036-0vxq2kivbnbugp6g-1
modified:
  README                         sp1f-readme-19700101030959-ipf4glwvob7zbr3norl5feyy3jwy3sod
  storage/xtradb/buf/buf0flu.c   buf0flu.c-20081201061010-zymrrwrczns2vrex-50
  storage/xtradb/handler/ha_innodb.cc ha_innodb.cc-20081201061010-zymrrwrczns2vrex-70
  storage/xtradb/include/row0mysql.h row0mysql.h-20081201061010-zymrrwrczns2vrex-199
  storage/xtradb/include/srv0srv.h srv0srv.h-20081201061010-zymrrwrczns2vrex-219
  storage/xtradb/include/trx0trx.h trx0trx.h-20081201061010-zymrrwrczns2vrex-242
  storage/xtradb/include/trx0trx.ic trx0trx.ic-20081201061010-zymrrwrczns2vrex-243
  storage/xtradb/lock/lock0lock.c lock0lock.c-20081201061010-zymrrwrczns2vrex-269
  storage/xtradb/row/row0mysql.c row0mysql.c-20081201061010-zymrrwrczns2vrex-336
  storage/xtradb/row/row0sel.c   row0sel.c-20081201061010-zymrrwrczns2vrex-339
  storage/xtradb/srv/srv0srv.c   srv0srv.c-20081201061010-zymrrwrczns2vrex-347
  storage/xtradb/trx/trx0trx.c   trx0trx.c-20081201061010-zymrrwrczns2vrex-359
    ------------------------------------------------------------
    revno: 0.6.2
    revision-id: aleksandr.kuzminsky@xxxxxxxxxxx-20090810223610-ssatw3bi8t3ggr5z
    parent: aleksandr.kuzminsky@xxxxxxxxxxx-20090809070458-cjko9m35law9bx9r
    committer: Aleksandr Kuzminsky <aleksandr.kuzminsky@xxxxxxxxxxx>
    branch nick: percona-xtradb
    timestamp: Mon 2009-08-10 22:36:10 +0000
    message:
      sync with rev.94
    modified:
      handler/ha_innodb.cc           ha_innodb.cc-20081201061010-zymrrwrczns2vrex-70
      include/srv0srv.h              srv0srv.h-20081201061010-zymrrwrczns2vrex-219
      srv/srv0srv.c                  srv0srv.c-20081201061010-zymrrwrczns2vrex-347
    ------------------------------------------------------------
    revno: 0.6.1
    revision-id: aleksandr.kuzminsky@xxxxxxxxxxx-20090809070458-cjko9m35law9bx9r
    parent: vadim@xxxxxxxxxxx-20090626080424-i7bdmrag8piw0fc3
    committer: Aleksandr Kuzminsky <aleksandr.kuzminsky@xxxxxxxxxxx>
    branch nick: percona-xtradb
    timestamp: Sun 2009-08-09 07:04:58 +0000
    message:
      sync with rev.93
    modified:
      buf/buf0flu.c                  buf0flu.c-20081201061010-zymrrwrczns2vrex-50
      buf/buf0rea.c                  buf0rea.c-20081201061010-zymrrwrczns2vrex-52
      dict/dict0dict.c               dict0dict.c-20081201061010-zymrrwrczns2vrex-57
      handler/ha_innodb.cc           ha_innodb.cc-20081201061010-zymrrwrczns2vrex-70
      handler/innodb_patch_info.h    innodb_patch_info.h-20081206234022-hep6ryfeacyr0572-1
      include/row0mysql.h            row0mysql.h-20081201061010-zymrrwrczns2vrex-199
      include/srv0srv.h              srv0srv.h-20081201061010-zymrrwrczns2vrex-219
      include/trx0trx.h              trx0trx.h-20081201061010-zymrrwrczns2vrex-242
      include/trx0trx.ic             trx0trx.ic-20081201061010-zymrrwrczns2vrex-243
      include/univ.i                 univ.i-20081201061010-zymrrwrczns2vrex-248
      lock/lock0lock.c               lock0lock.c-20081201061010-zymrrwrczns2vrex-269
      log/log0recv.c                 log0recv.c-20081201061010-zymrrwrczns2vrex-271
      mysql-test/innodb-analyze.test innodbanalyze.test-20081203050234-edoolglm28lyejuc-6
      mysql-test/innodb_xtradb_bug317074.result innodb_xtradb_bug317-20090326061054-ylrdb8libxw6u7e9-8
      mysql-test/innodb_xtradb_bug317074.test innodb_xtradb_bug317-20090326061054-ylrdb8libxw6u7e9-9
      mysql-test/patches/events_stress.diff events_stress.diff-20090420133118-3nkd032ighnz203p-1
      mysql-test/patches/information_schema.diff information_schema.d-20081203050234-edoolglm28lyejuc-21
      mysql-test/patches/information_schema_db.diff information_schema_d-20090420133118-3nkd032ighnz203p-2
      mysql-test/patches/mysqlshow.diff mysqlshow.diff-20090420133118-3nkd032ighnz203p-6
      row/row0mysql.c                row0mysql.c-20081201061010-zymrrwrczns2vrex-336
      row/row0sel.c                  row0sel.c-20081201061010-zymrrwrczns2vrex-339
      srv/srv0srv.c                  srv0srv.c-20081201061010-zymrrwrczns2vrex-347
      trx/trx0trx.c                  trx0trx.c-20081201061010-zymrrwrczns2vrex-359

Diff too large for email (1212 lines, the limit is 1000).