Merge authors: Kristian Nielsen (knielsen) Paul McCullagh (paul-mccullagh) Related merge proposals: https://code.launchpad.net/~paul-mccullagh/maria/maria-pbxt-rc2/+merge/10303 proposed by: Paul McCullagh (paul-mccullagh) ------------------------------------------------------------ revno: 2722 [merge] committer: knielsen@knielsen-hq.org branch nick: work timestamp: Mon 2009-08-31 13:23:39 +0200 message: Merge Paul's maria-pbxt-rc2 branch into MariaDB. Includes disabling PBMS (per Paul's recommendation) and test file fixes. Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org> removed: storage/pbxt/src/streaming_xt.cc storage/pbxt/src/streaming_xt.h added: mysql-test/suite/pbxt/t/lowercase_table_grant-master.opt mysql-test/suite/pbxt/t/lowercase_table_qcache-master.opt mysql-test/suite/pbxt/t/lowercase_view-master.opt mysql-test/suite/pbxt/t/udf-master.opt storage/pbxt/src/pbms_enabled.cc storage/pbxt/src/pbms_enabled.h modified: mysql-test/suite/pbxt/r/alter_table.result mysql-test/suite/pbxt/r/analyze.result mysql-test/suite/pbxt/r/auto_increment.result mysql-test/suite/pbxt/r/delete.result mysql-test/suite/pbxt/r/distinct.result mysql-test/suite/pbxt/r/func_group.result mysql-test/suite/pbxt/r/func_math.result mysql-test/suite/pbxt/r/func_str.result mysql-test/suite/pbxt/r/grant.result mysql-test/suite/pbxt/r/group_min_max.result mysql-test/suite/pbxt/r/join.result mysql-test/suite/pbxt/r/join_nested.result mysql-test/suite/pbxt/r/key.result mysql-test/suite/pbxt/r/key_cache.result mysql-test/suite/pbxt/r/key_diff.result mysql-test/suite/pbxt/r/lowercase_view.result mysql-test/suite/pbxt/r/mysqlshow.result mysql-test/suite/pbxt/r/null.result mysql-test/suite/pbxt/r/null_key.result mysql-test/suite/pbxt/r/partition_pruning.result mysql-test/suite/pbxt/r/pbxt_bugs.result mysql-test/suite/pbxt/r/pbxt_ref_int.result mysql-test/suite/pbxt/r/preload.result mysql-test/suite/pbxt/r/ps_1general.result mysql-test/suite/pbxt/r/range.result mysql-test/suite/pbxt/r/schema.result mysql-test/suite/pbxt/r/select.result mysql-test/suite/pbxt/r/select_safe.result mysql-test/suite/pbxt/r/subselect.result mysql-test/suite/pbxt/r/type_enum.result mysql-test/suite/pbxt/r/type_ranges.result mysql-test/suite/pbxt/r/type_timestamp.result mysql-test/suite/pbxt/r/union.result mysql-test/suite/pbxt/r/view_grant.result mysql-test/suite/pbxt/t/auto_increment.test mysql-test/suite/pbxt/t/delete.test mysql-test/suite/pbxt/t/join_nested.test mysql-test/suite/pbxt/t/null.test mysql-test/suite/pbxt/t/pbxt_bugs.test mysql-test/suite/pbxt/t/rename.test mysql-test/suite/pbxt/t/schema.test mysql-test/suite/pbxt/t/type_enum.test mysql-test/suite/pbxt/t/union.test storage/pbxt/ChangeLog storage/pbxt/src/Makefile.am storage/pbxt/src/cache_xt.cc storage/pbxt/src/cache_xt.h storage/pbxt/src/ccutils_xt.cc storage/pbxt/src/database_xt.cc storage/pbxt/src/datadic_xt.cc storage/pbxt/src/datadic_xt.h storage/pbxt/src/datalog_xt.cc storage/pbxt/src/datalog_xt.h 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.cc storage/pbxt/src/ha_xtsys.h storage/pbxt/src/hashtab_xt.cc storage/pbxt/src/heap_xt.cc storage/pbxt/src/heap_xt.h storage/pbxt/src/index_xt.cc storage/pbxt/src/index_xt.h storage/pbxt/src/lock_xt.cc storage/pbxt/src/lock_xt.h storage/pbxt/src/locklist_xt.cc storage/pbxt/src/locklist_xt.h storage/pbxt/src/memory_xt.cc storage/pbxt/src/memory_xt.h storage/pbxt/src/myxt_xt.cc storage/pbxt/src/myxt_xt.h storage/pbxt/src/pbms.h storage/pbxt/src/pthread_xt.cc storage/pbxt/src/restart_xt.cc storage/pbxt/src/restart_xt.h storage/pbxt/src/sortedlist_xt.cc storage/pbxt/src/strutil_xt.cc storage/pbxt/src/systab_xt.cc storage/pbxt/src/systab_xt.h 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/trace_xt.cc storage/pbxt/src/trace_xt.h storage/pbxt/src/util_xt.cc 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 The size of the diff (15366 lines) is larger than your specified limit of 1000 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.