maria-developers team mailing list archive

Thread
Date

[Branch ~maria-captains/maria/5.1] Rev 2784: Automatic merge of PBXT 1.0.09f RC3 into MariaDB trunk.

To: "askmonty.org Worklog" <worklog-db@xxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 21 Dec 2009 09:44:19 -0000
Delivered-to: worklog-db@xxxxxxxxxxxx
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  Kristian Nielsen (knielsen)
  Paul McCullagh (paul-mccullagh)
Related merge proposals:
  https://code.launchpad.net/~paul-mccullagh/maria/maria-pbxt-rc3/+merge/15934
  proposed by: Paul McCullagh (paul-mccullagh)
------------------------------------------------------------
revno: 2784 [merge]
committer: knielsen@xxxxxxxxxxxxxxx
branch nick: mariadb-5.1
timestamp: Mon 2009-12-21 10:42:28 +0100
message:
  Automatic merge of PBXT 1.0.09f RC3 into MariaDB trunk.
added:
  storage/pbxt/src/backup_xt.cc
  storage/pbxt/src/backup_xt.h
modified:
  sql/handler.cc
  storage/pbxt/ChangeLog
  storage/pbxt/src/Makefile.am
  storage/pbxt/src/cache_xt.cc
  storage/pbxt/src/cache_xt.h
  storage/pbxt/src/database_xt.cc
  storage/pbxt/src/database_xt.h
  storage/pbxt/src/datadic_xt.cc
  storage/pbxt/src/datalog_xt.cc
  storage/pbxt/src/discover_xt.cc
  storage/pbxt/src/filesys_xt.cc
  storage/pbxt/src/filesys_xt.h
  storage/pbxt/src/ha_pbxt.cc
  storage/pbxt/src/ha_pbxt.h
  storage/pbxt/src/ha_xtsys.h
  storage/pbxt/src/heap_xt.cc
  storage/pbxt/src/index_xt.cc
  storage/pbxt/src/lock_xt.cc
  storage/pbxt/src/locklist_xt.h
  storage/pbxt/src/memory_xt.cc
  storage/pbxt/src/myxt_xt.cc
  storage/pbxt/src/myxt_xt.h
  storage/pbxt/src/pbms.h
  storage/pbxt/src/pbms_enabled.cc
  storage/pbxt/src/pbms_enabled.h
  storage/pbxt/src/pthread_xt.cc
  storage/pbxt/src/restart_xt.cc
  storage/pbxt/src/restart_xt.h
  storage/pbxt/src/strutil_xt.cc
  storage/pbxt/src/systab_xt.cc
  storage/pbxt/src/tabcache_xt.cc
  storage/pbxt/src/tabcache_xt.h
  storage/pbxt/src/table_xt.cc
  storage/pbxt/src/table_xt.h
  storage/pbxt/src/thread_xt.cc
  storage/pbxt/src/thread_xt.h
  storage/pbxt/src/util_xt.cc
  storage/pbxt/src/util_xt.h
  storage/pbxt/src/xaction_xt.cc
  storage/pbxt/src/xaction_xt.h
  storage/pbxt/src/xactlog_xt.cc
  storage/pbxt/src/xactlog_xt.h
  storage/pbxt/src/xt_config.h
  storage/pbxt/src/xt_defs.h
  storage/pbxt/src/xt_errno.h
The size of the diff (5758 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.