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

Branch merges

Propose for merging

Merged into lp:~maria-captains/maria/5.1-converting at revision 2860

Maria-captains: Pending requested 2010-05-07

Diff: 5018 lines (+1575/-531)

44 files modified

mysql-test/suite/pbxt/r/func_str.result (+1/-1)
mysql-test/suite/pbxt/r/group_min_max.result (+42/-42)
mysql-test/suite/pbxt/r/join_nested.result (+1/-1)
mysql-test/suite/pbxt/r/negation_elimination.result (+1/-1)
mysql-test/suite/pbxt/r/null.result (+1/-1)
mysql-test/suite/pbxt/r/order_by.result (+4/-4)
mysql-test/suite/pbxt/r/pbxt_ref_int.result (+2/-2)
mysql-test/suite/pbxt/r/range.result (+1/-1)
mysql-test/suite/pbxt/r/select.result (+19/-19)
storage/pbxt/ChangeLog (+105/-0)
storage/pbxt/src/backup_xt.cc (+3/-3)
storage/pbxt/src/cache_xt.cc (+87/-8)
storage/pbxt/src/cache_xt.h (+9/-5)
storage/pbxt/src/database_xt.cc (+7/-1)
storage/pbxt/src/database_xt.h (+5/-0)
storage/pbxt/src/datadic_xt.cc (+75/-49)
storage/pbxt/src/datadic_xt.h (+1/-2)
storage/pbxt/src/datalog_xt.cc (+6/-1)
storage/pbxt/src/filesys_xt.h (+1/-1)
storage/pbxt/src/ha_pbxt.cc (+213/-64)
storage/pbxt/src/index_xt.cc (+68/-24)
storage/pbxt/src/index_xt.h (+3/-3)
storage/pbxt/src/lock_xt.cc (+161/-16)
storage/pbxt/src/lock_xt.h (+61/-5)
storage/pbxt/src/locklist_xt.cc (+4/-0)
storage/pbxt/src/myxt_xt.cc (+29/-6)
storage/pbxt/src/pthread_xt.cc (+83/-19)
storage/pbxt/src/pthread_xt.h (+41/-36)
storage/pbxt/src/restart_xt.cc (+138/-6)
storage/pbxt/src/restart_xt.h (+4/-0)
storage/pbxt/src/strutil_xt.cc (+1/-1)
storage/pbxt/src/tabcache_xt.cc (+84/-30)
storage/pbxt/src/tabcache_xt.h (+3/-1)
storage/pbxt/src/table_xt.cc (+145/-101)
storage/pbxt/src/table_xt.h (+8/-3)
storage/pbxt/src/thread_xt.cc (+17/-10)
storage/pbxt/src/thread_xt.h (+6/-3)
storage/pbxt/src/trace_xt.cc (+17/-6)
storage/pbxt/src/trace_xt.h (+2/-0)
storage/pbxt/src/xaction_xt.cc (+24/-14)
storage/pbxt/src/xaction_xt.h (+2/-2)
storage/pbxt/src/xactlog_xt.cc (+69/-30)
storage/pbxt/src/xactlog_xt.h (+6/-2)
storage/pbxt/src/xt_defs.h (+15/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2852. By Paul McCullagh on 2010-05-06

Merged with trunk

2851. By Kristian Nielsen on 2010-05-05

Change commit mails to go to <email address hidden>

2850. By Kristian Nielsen on 2010-04-29

Fix missing bounds check in string conversion.
Bump version number for security fix release.

2849. By Kristian Nielsen <knielsen@odin> on 2010-04-28

Fix buffer overflow in COM_FIELD_LIST.

2848. By Bo Thorsen on 2010-04-21

Fix a bunch of Windows warnings

2847. By Bo Thorsen on 2010-04-09

Remove unnecessary redefinition of TAILQ_EMPTY

2846. By Bo Thorsen on 2010-04-09

Fix Windows compile

2845. By Igor Babaev on 2010-04-08

Fixed a problem of merge from mysql-5.1 baseline.

2844. By Michael Widenius on 2010-04-08

Fixed race condition in safe_process.cc which may have caused some mysqltests to be reported as failed even if they succeded.

2843. By Michael Widenius on 2010-04-08

Fixed syntax error and some timeing issues in test suite