lp:~paul-mccullagh/maria/maria-pbxt-rc3

Branch merges

Propose for merging

Merged into lp:~maria-captains/maria/5.1-converting

Kristian Nielsen: Approve on 2009-12-21

Paul McCullagh: Pending requested 2009-12-10

Diff: 5759 lines (+2595/-366)

47 files modified

sql/handler.cc (+9/-1)
storage/pbxt/ChangeLog (+52/-0)
storage/pbxt/src/Makefile.am (+2/-2)
storage/pbxt/src/backup_xt.cc (+802/-0)
storage/pbxt/src/backup_xt.h (+34/-0)
storage/pbxt/src/cache_xt.cc (+7/-3)
storage/pbxt/src/cache_xt.h (+1/-1)
storage/pbxt/src/database_xt.cc (+14/-0)
storage/pbxt/src/database_xt.h (+8/-0)
storage/pbxt/src/datadic_xt.cc (+1/-6)
storage/pbxt/src/datalog_xt.cc (+4/-4)
storage/pbxt/src/discover_xt.cc (+301/-15)
storage/pbxt/src/filesys_xt.cc (+3/-5)
storage/pbxt/src/filesys_xt.h (+1/-1)
storage/pbxt/src/ha_pbxt.cc (+526/-119)
storage/pbxt/src/ha_pbxt.h (+26/-9)
storage/pbxt/src/ha_xtsys.h (+2/-1)
storage/pbxt/src/heap_xt.cc (+1/-1)
storage/pbxt/src/index_xt.cc (+18/-7)
storage/pbxt/src/lock_xt.cc (+1/-1)
storage/pbxt/src/locklist_xt.h (+7/-2)
storage/pbxt/src/memory_xt.cc (+2/-3)
storage/pbxt/src/myxt_xt.cc (+164/-29)
storage/pbxt/src/myxt_xt.h (+4/-0)
storage/pbxt/src/pbms.h (+12/-12)
storage/pbxt/src/pbms_enabled.cc (+11/-12)
storage/pbxt/src/pbms_enabled.h (+0/-7)
storage/pbxt/src/pthread_xt.cc (+2/-2)
storage/pbxt/src/restart_xt.cc (+119/-49)
storage/pbxt/src/restart_xt.h (+13/-1)
storage/pbxt/src/strutil_xt.cc (+10/-4)
storage/pbxt/src/systab_xt.cc (+2/-2)
storage/pbxt/src/tabcache_xt.cc (+3/-1)
storage/pbxt/src/tabcache_xt.h (+1/-1)
storage/pbxt/src/table_xt.cc (+85/-20)
storage/pbxt/src/table_xt.h (+3/-2)
storage/pbxt/src/thread_xt.cc (+16/-1)
storage/pbxt/src/thread_xt.h (+4/-1)
storage/pbxt/src/util_xt.cc (+17/-0)
storage/pbxt/src/util_xt.h (+1/-0)
storage/pbxt/src/xaction_xt.cc (+169/-6)
storage/pbxt/src/xaction_xt.h (+29/-1)
storage/pbxt/src/xactlog_xt.cc (+48/-23)
storage/pbxt/src/xactlog_xt.h (+12/-2)
storage/pbxt/src/xt_config.h (+15/-2)
storage/pbxt/src/xt_defs.h (+30/-7)
storage/pbxt/src/xt_errno.h (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #345524: pbxt does not compile on 64 bit windows

High

Fix Released

Link a bug report

Related blueprints

2776. By Paul McCullagh on 2009-12-10

According to Sergei this code must be removed when a second engine supports XA

2775. By Paul McCullagh on 2009-12-10

Modified RN291: Fixed bug #489088, I use plugin_unlock to remove the reference from the THD, as it is not required

2774. By Paul McCullagh on 2009-12-01

Merged with MariaDB trunk

2773. By Paul McCullagh on 2009-12-01

Fixed bug #489088

2772. By Paul McCullagh on 2009-11-27

Merged with trunk

2771. By Paul McCullagh on 2009-11-27

Fixed some warnings from 64-bit Windows

2770. By Paul McCullagh on 2009-11-25

Merge change from Drizzle

2769. By Paul McCullagh on 2009-11-25

And don't forget sub-partitions!

2768. By Paul McCullagh on 2009-11-25

Merged fix for test run

2767. By Paul McCullagh on 2009-11-25

Merged with trunk and added Release notes