At file:///home/psergey/dev/maria-5.1-table-elim-r12/ ------------------------------------------------------------ revno: 2749 revision-id: psergey@askmonty.org-20090901222000-st4iicaxopeex2s1 parent: psergey@askmonty.org-20090826210140-y2pba3ucdwnvr956 parent: psergey@askmonty.org-20090901115954-nge2brzh3akkmtlz committer: Sergey Petrunya <psergey@askmonty.org> branch nick: maria-5.1-table-elim-r12 timestamp: Wed 2009-09-02 02:20:00 +0400 message: Merge removed: storage/pbxt/src/streaming_xt.cc streaming_xt.cc-20090326121724-x683v32twzr3fi0y-57 storage/pbxt/src/streaming_xt.h streaming_xt.h-20090326121724-x683v32twzr3fi0y-58 added: mysql-test/suite/pbxt/t/lowercase_table_grant-master.opt lowercase_table_gran-20090828130852-3duj73io0g345hxj-1 mysql-test/suite/pbxt/t/lowercase_table_qcache-master.opt lowercase_table_qcac-20090828130852-3duj73io0g345hxj-2 mysql-test/suite/pbxt/t/lowercase_view-master.opt lowercase_viewmaster-20090828130852-3duj73io0g345hxj-3 mysql-test/suite/pbxt/t/udf-master.opt udfmaster.opt-20090828130852-3duj73io0g345hxj-4 storage/pbxt/src/pbms_enabled.cc pbms_enabled.cc-20090818074502-tybcb62hp1kdrk3l-1 storage/pbxt/src/pbms_enabled.h pbms_enabled.h-20090818074502-tybcb62hp1kdrk3l-2 modified: BUILD/Makefile.am sp1f-makefile.am-20020102192940-dza66ux2yxyklupzjz4q3km3hvye5rnj libmysql/CMakeLists.txt sp1f-cmakelists.txt-20060831175237-3bbprkzqdl3gopcnlt3evmaikau67bcq mysql-test/suite/pbxt/r/alter_table.result alter_table.result-20090402100035-4ilk9i91sh65vjcb-5 mysql-test/suite/pbxt/r/analyze.result analyze.result-20090402100035-4ilk9i91sh65vjcb-7 mysql-test/suite/pbxt/r/auto_increment.result auto_increment.resul-20090402100035-4ilk9i91sh65vjcb-9 mysql-test/suite/pbxt/r/delete.result delete.result-20090402100035-4ilk9i91sh65vjcb-31 mysql-test/suite/pbxt/r/distinct.result distinct.result-20090402100035-4ilk9i91sh65vjcb-34 mysql-test/suite/pbxt/r/func_group.result func_group.result-20090402100035-4ilk9i91sh65vjcb-50 mysql-test/suite/pbxt/r/func_math.result func_math.result-20090402100035-4ilk9i91sh65vjcb-55 mysql-test/suite/pbxt/r/func_str.result func_str.result-20090402100035-4ilk9i91sh65vjcb-61 mysql-test/suite/pbxt/r/grant.result grant.result-20090402100035-4ilk9i91sh65vjcb-65 mysql-test/suite/pbxt/r/group_min_max.result group_min_max.result-20090402100035-4ilk9i91sh65vjcb-69 mysql-test/suite/pbxt/r/join.result join.result-20090402100035-4ilk9i91sh65vjcb-79 mysql-test/suite/pbxt/r/join_nested.result join_nested.result-20090402100035-4ilk9i91sh65vjcb-81 mysql-test/suite/pbxt/r/key.result key.result-20090402100035-4ilk9i91sh65vjcb-83 mysql-test/suite/pbxt/r/key_cache.result key_cache.result-20090402100035-4ilk9i91sh65vjcb-84 mysql-test/suite/pbxt/r/key_diff.result key_diff.result-20090402100035-4ilk9i91sh65vjcb-85 mysql-test/suite/pbxt/r/lowercase_view.result lowercase_view.resul-20090402100035-4ilk9i91sh65vjcb-96 mysql-test/suite/pbxt/r/mysqlshow.result mysqlshow.result-20090402100035-4ilk9i91sh65vjcb-101 mysql-test/suite/pbxt/r/null.result null.result-20090402100035-4ilk9i91sh65vjcb-104 mysql-test/suite/pbxt/r/null_key.result null_key.result-20090402100035-4ilk9i91sh65vjcb-105 mysql-test/suite/pbxt/r/partition_pruning.result partition_pruning.re-20090402100035-4ilk9i91sh65vjcb-117 mysql-test/suite/pbxt/r/pbxt_bugs.result pbxt_bugs.result-20090402100035-4ilk9i91sh65vjcb-120 mysql-test/suite/pbxt/r/pbxt_ref_int.result pbxt_ref_int.result-20090402100035-4ilk9i91sh65vjcb-123 mysql-test/suite/pbxt/r/preload.result preload.result-20090402100035-4ilk9i91sh65vjcb-127 mysql-test/suite/pbxt/r/ps_1general.result ps_1general.result-20090402100035-4ilk9i91sh65vjcb-130 mysql-test/suite/pbxt/r/range.result range.result-20090402100035-4ilk9i91sh65vjcb-132 mysql-test/suite/pbxt/r/schema.result schema.result-20090402100035-4ilk9i91sh65vjcb-138 mysql-test/suite/pbxt/r/select.result select.result-20090402100035-4ilk9i91sh65vjcb-139 mysql-test/suite/pbxt/r/select_safe.result select_safe.result-20090402100035-4ilk9i91sh65vjcb-141 mysql-test/suite/pbxt/r/subselect.result subselect.result-20090402100035-4ilk9i91sh65vjcb-146 mysql-test/suite/pbxt/r/type_enum.result type_enum.result-20090402100035-4ilk9i91sh65vjcb-155 mysql-test/suite/pbxt/r/type_ranges.result type_ranges.result-20090402100035-4ilk9i91sh65vjcb-159 mysql-test/suite/pbxt/r/type_timestamp.result type_timestamp.resul-20090402100035-4ilk9i91sh65vjcb-162 mysql-test/suite/pbxt/r/union.result union.result-20090402100035-4ilk9i91sh65vjcb-166 mysql-test/suite/pbxt/r/view_grant.result view_grant.result-20090402100035-4ilk9i91sh65vjcb-169 mysql-test/suite/pbxt/t/auto_increment.test auto_increment.test-20090402100035-4ilk9i91sh65vjcb-176 mysql-test/suite/pbxt/t/delete.test delete.test-20090402100035-4ilk9i91sh65vjcb-198 mysql-test/suite/pbxt/t/join_nested.test join_nested.test-20090402100035-4ilk9i91sh65vjcb-248 mysql-test/suite/pbxt/t/null.test null.test-20090402100035-4ilk9i91sh65vjcb-271 mysql-test/suite/pbxt/t/pbxt_bugs.test pbxt_bugs.test-20090402100035-4ilk9i91sh65vjcb-287 mysql-test/suite/pbxt/t/rename.test rename.test-20090402100035-4ilk9i91sh65vjcb-301 mysql-test/suite/pbxt/t/schema.test schema.test-20090402100035-4ilk9i91sh65vjcb-305 mysql-test/suite/pbxt/t/type_enum.test type_enum.test-20090402100035-4ilk9i91sh65vjcb-322 mysql-test/suite/pbxt/t/union.test union.test-20090402100035-4ilk9i91sh65vjcb-333 sql/CMakeLists.txt sp1f-cmakelists.txt-20060831175237-esoeu5kpdtwjvehkghwy6fzbleniq2wy storage/pbxt/ChangeLog changelog-20090326121724-x683v32twzr3fi0y-3 storage/pbxt/src/Makefile.am makefile.am-20090326121724-x683v32twzr3fi0y-13 storage/pbxt/src/cache_xt.cc cache_xt.cc-20090326121724-x683v32twzr3fi0y-16 storage/pbxt/src/cache_xt.h cache_xt.h-20090326121724-x683v32twzr3fi0y-17 storage/pbxt/src/ccutils_xt.cc ccutils_xt.cc-20090326121724-x683v32twzr3fi0y-18 storage/pbxt/src/database_xt.cc database_xt.cc-20090326121724-x683v32twzr3fi0y-20 storage/pbxt/src/datadic_xt.cc datadic_xt.cc-20090326121724-x683v32twzr3fi0y-22 storage/pbxt/src/datadic_xt.h datadic_xt.h-20090326121724-x683v32twzr3fi0y-23 storage/pbxt/src/datalog_xt.cc datalog_xt.cc-20090326121724-x683v32twzr3fi0y-24 storage/pbxt/src/datalog_xt.h datalog_xt.h-20090326121724-x683v32twzr3fi0y-25 storage/pbxt/src/discover_xt.cc discover_xt.cc-20090326121724-x683v32twzr3fi0y-26 storage/pbxt/src/filesys_xt.cc filesys_xt.cc-20090326121724-x683v32twzr3fi0y-28 storage/pbxt/src/filesys_xt.h filesys_xt.h-20090326121724-x683v32twzr3fi0y-29 storage/pbxt/src/ha_pbxt.cc ha_pbxt.cc-20090326121724-x683v32twzr3fi0y-30 storage/pbxt/src/ha_pbxt.h ha_pbxt.h-20090326121724-x683v32twzr3fi0y-31 storage/pbxt/src/ha_xtsys.cc ha_xtsys.cc-20090326121724-x683v32twzr3fi0y-32 storage/pbxt/src/ha_xtsys.h ha_xtsys.h-20090326121724-x683v32twzr3fi0y-33 storage/pbxt/src/hashtab_xt.cc hashtab_xt.cc-20090326121724-x683v32twzr3fi0y-34 storage/pbxt/src/heap_xt.cc heap_xt.cc-20090326121724-x683v32twzr3fi0y-36 storage/pbxt/src/heap_xt.h heap_xt.h-20090326121724-x683v32twzr3fi0y-37 storage/pbxt/src/index_xt.cc index_xt.cc-20090326121724-x683v32twzr3fi0y-38 storage/pbxt/src/index_xt.h index_xt.h-20090326121724-x683v32twzr3fi0y-39 storage/pbxt/src/lock_xt.cc lock_xt.cc-20090326121724-x683v32twzr3fi0y-42 storage/pbxt/src/lock_xt.h lock_xt.h-20090326121724-x683v32twzr3fi0y-43 storage/pbxt/src/locklist_xt.cc locklist_xt.cc-20090326121724-x683v32twzr3fi0y-44 storage/pbxt/src/locklist_xt.h locklist_xt.h-20090326121724-x683v32twzr3fi0y-45 storage/pbxt/src/memory_xt.cc memory_xt.cc-20090326121724-x683v32twzr3fi0y-46 storage/pbxt/src/memory_xt.h memory_xt.h-20090326121724-x683v32twzr3fi0y-47 storage/pbxt/src/myxt_xt.cc myxt_xt.cc-20090326121724-x683v32twzr3fi0y-48 storage/pbxt/src/myxt_xt.h myxt_xt.h-20090326121724-x683v32twzr3fi0y-49 storage/pbxt/src/pbms.h pbms.h-20090326121724-x683v32twzr3fi0y-50 storage/pbxt/src/pthread_xt.cc pthread_xt.cc-20090326121724-x683v32twzr3fi0y-51 storage/pbxt/src/restart_xt.cc restart_xt.cc-20090326121724-x683v32twzr3fi0y-53 storage/pbxt/src/restart_xt.h restart_xt.h-20090326121724-x683v32twzr3fi0y-54 storage/pbxt/src/sortedlist_xt.cc sortedlist_xt.cc-20090326121724-x683v32twzr3fi0y-55 storage/pbxt/src/strutil_xt.cc strutil_xt.cc-20090326121724-x683v32twzr3fi0y-59 storage/pbxt/src/systab_xt.cc systab_xt.cc-20090326121724-x683v32twzr3fi0y-61 storage/pbxt/src/systab_xt.h systab_xt.h-20090326121724-x683v32twzr3fi0y-62 storage/pbxt/src/tabcache_xt.cc tabcache_xt.cc-20090326121724-x683v32twzr3fi0y-63 storage/pbxt/src/tabcache_xt.h tabcache_xt.h-20090326121724-x683v32twzr3fi0y-64 storage/pbxt/src/table_xt.cc table_xt.cc-20090326121724-x683v32twzr3fi0y-65 storage/pbxt/src/table_xt.h table_xt.h-20090326121724-x683v32twzr3fi0y-66 storage/pbxt/src/thread_xt.cc thread_xt.cc-20090326121724-x683v32twzr3fi0y-67 storage/pbxt/src/thread_xt.h thread_xt.h-20090326121724-x683v32twzr3fi0y-68 storage/pbxt/src/trace_xt.cc trace_xt.cc-20090326121724-x683v32twzr3fi0y-69 storage/pbxt/src/trace_xt.h trace_xt.h-20090326121724-x683v32twzr3fi0y-70 storage/pbxt/src/util_xt.cc util_xt.cc-20090326121724-x683v32twzr3fi0y-71 storage/pbxt/src/xaction_xt.cc xaction_xt.cc-20090326121724-x683v32twzr3fi0y-74 storage/pbxt/src/xaction_xt.h xaction_xt.h-20090326121724-x683v32twzr3fi0y-75 storage/pbxt/src/xactlog_xt.cc xactlog_xt.cc-20090326121724-x683v32twzr3fi0y-76 storage/pbxt/src/xactlog_xt.h xactlog_xt.h-20090326121724-x683v32twzr3fi0y-77 storage/pbxt/src/xt_config.h xt_config.h-20090326121724-x683v32twzr3fi0y-78 storage/pbxt/src/xt_defs.h xt_defs.h-20090326121724-x683v32twzr3fi0y-79 storage/xtradb/Makefile.am makefile.am-20081201061010-zymrrwrczns2vrex-4 storage/xtradb/btr/btr0cur.c btr0cur.c-20081201061010-zymrrwrczns2vrex-45 storage/xtradb/buf/buf0buddy.c buf0buddy.c-20081201061010-zymrrwrczns2vrex-48 storage/xtradb/buf/buf0flu.c buf0flu.c-20081201061010-zymrrwrczns2vrex-50 storage/xtradb/fil/fil0fil.c fil0fil.c-20081201061010-zymrrwrczns2vrex-63 storage/xtradb/handler/i_s.cc i_s.cc-20081201061010-zymrrwrczns2vrex-73 storage/xtradb/srv/srv0srv.c srv0srv.c-20081201061010-zymrrwrczns2vrex-347 strings/CMakeLists.txt sp1f-cmakelists.txt-20060831175237-zpsnblto443qz4bb5okg23rsacehr4d2 unittest/mysys/waiting_threads-t.c waiting_threadst.c-20080623170213-r8baqa2porlpxzq1-5 ------------------------------------------------------------ revno: 2719.1.4 revision-id: psergey@askmonty.org-20090901115954-nge2brzh3akkmtlz parent: knielsen@knielsen-hq.org-20090831112339-td6t7ljy4w2oamvt committer: Sergey Petrunya <psergey@askmonty.org> branch nick: maria-5.1-fixwindows timestamp: Tue 2009-09-01 15:59:54 +0400 message: Trivial fixes for windows compile failures - Add strmov_overlapp.c where it's needed - Add libevent where it is required - Fix typo in unittest/mysys/waiting_threads-t.c - fix xtradb C language source so that they have variable declarations before any operators, as it is (or was?) required in C. modified: libmysql/CMakeLists.txt sp1f-cmakelists.txt-20060831175237-3bbprkzqdl3gopcnlt3evmaikau67bcq sql/CMakeLists.txt sp1f-cmakelists.txt-20060831175237-esoeu5kpdtwjvehkghwy6fzbleniq2wy storage/xtradb/btr/btr0cur.c btr0cur.c-20081201061010-zymrrwrczns2vrex-45 storage/xtradb/buf/buf0buddy.c buf0buddy.c-20081201061010-zymrrwrczns2vrex-48 storage/xtradb/buf/buf0flu.c buf0flu.c-20081201061010-zymrrwrczns2vrex-50 storage/xtradb/fil/fil0fil.c fil0fil.c-20081201061010-zymrrwrczns2vrex-63 storage/xtradb/handler/i_s.cc i_s.cc-20081201061010-zymrrwrczns2vrex-73 storage/xtradb/srv/srv0srv.c srv0srv.c-20081201061010-zymrrwrczns2vrex-347 strings/CMakeLists.txt sp1f-cmakelists.txt-20060831175237-zpsnblto443qz4bb5okg23rsacehr4d2 unittest/mysys/waiting_threads-t.c waiting_threadst.c-20080623170213-r8baqa2porlpxzq1-5 ------------------------------------------------------------ revno: 2719.1.3 revision-id: knielsen@knielsen-hq.org-20090831112339-td6t7ljy4w2oamvt parent: knielsen@knielsen-hq.org-20090829194804-rfq9dbai99do12ub parent: knielsen@knielsen-hq.org-20090831110744-ru07dzndci7cf92k 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 streaming_xt.cc-20090326121724-x683v32twzr3fi0y-57 storage/pbxt/src/streaming_xt.h streaming_xt.h-20090326121724-x683v32twzr3fi0y-58 added: mysql-test/suite/pbxt/t/lowercase_table_grant-master.opt lowercase_table_gran-20090828130852-3duj73io0g345hxj-1 mysql-test/suite/pbxt/t/lowercase_table_qcache-master.opt lowercase_table_qcac-20090828130852-3duj73io0g345hxj-2 mysql-test/suite/pbxt/t/lowercase_view-master.opt lowercase_viewmaster-20090828130852-3duj73io0g345hxj-3 mysql-test/suite/pbxt/t/udf-master.opt udfmaster.opt-20090828130852-3duj73io0g345hxj-4 storage/pbxt/src/pbms_enabled.cc pbms_enabled.cc-20090818074502-tybcb62hp1kdrk3l-1 storage/pbxt/src/pbms_enabled.h pbms_enabled.h-20090818074502-tybcb62hp1kdrk3l-2 modified: mysql-test/suite/pbxt/r/alter_table.result alter_table.result-20090402100035-4ilk9i91sh65vjcb-5 mysql-test/suite/pbxt/r/analyze.result analyze.result-20090402100035-4ilk9i91sh65vjcb-7 mysql-test/suite/pbxt/r/auto_increment.result auto_increment.resul-20090402100035-4ilk9i91sh65vjcb-9 mysql-test/suite/pbxt/r/delete.result delete.result-20090402100035-4ilk9i91sh65vjcb-31 mysql-test/suite/pbxt/r/distinct.result distinct.result-20090402100035-4ilk9i91sh65vjcb-34 mysql-test/suite/pbxt/r/func_group.result func_group.result-20090402100035-4ilk9i91sh65vjcb-50 mysql-test/suite/pbxt/r/func_math.result func_math.result-20090402100035-4ilk9i91sh65vjcb-55 mysql-test/suite/pbxt/r/func_str.result func_str.result-20090402100035-4ilk9i91sh65vjcb-61 mysql-test/suite/pbxt/r/grant.result grant.result-20090402100035-4ilk9i91sh65vjcb-65 mysql-test/suite/pbxt/r/group_min_max.result group_min_max.result-20090402100035-4ilk9i91sh65vjcb-69 mysql-test/suite/pbxt/r/join.result join.result-20090402100035-4ilk9i91sh65vjcb-79 mysql-test/suite/pbxt/r/join_nested.result join_nested.result-20090402100035-4ilk9i91sh65vjcb-81 mysql-test/suite/pbxt/r/key.result key.result-20090402100035-4ilk9i91sh65vjcb-83 mysql-test/suite/pbxt/r/key_cache.result key_cache.result-20090402100035-4ilk9i91sh65vjcb-84 mysql-test/suite/pbxt/r/key_diff.result key_diff.result-20090402100035-4ilk9i91sh65vjcb-85 mysql-test/suite/pbxt/r/lowercase_view.result lowercase_view.resul-20090402100035-4ilk9i91sh65vjcb-96 mysql-test/suite/pbxt/r/mysqlshow.result mysqlshow.result-20090402100035-4ilk9i91sh65vjcb-101 mysql-test/suite/pbxt/r/null.result null.result-20090402100035-4ilk9i91sh65vjcb-104 mysql-test/suite/pbxt/r/null_key.result null_key.result-20090402100035-4ilk9i91sh65vjcb-105 mysql-test/suite/pbxt/r/partition_pruning.result partition_pruning.re-20090402100035-4ilk9i91sh65vjcb-117 mysql-test/suite/pbxt/r/pbxt_bugs.result pbxt_bugs.result-20090402100035-4ilk9i91sh65vjcb-120 mysql-test/suite/pbxt/r/pbxt_ref_int.result pbxt_ref_int.result-20090402100035-4ilk9i91sh65vjcb-123 mysql-test/suite/pbxt/r/preload.result preload.result-20090402100035-4ilk9i91sh65vjcb-127 mysql-test/suite/pbxt/r/ps_1general.result ps_1general.result-20090402100035-4ilk9i91sh65vjcb-130 mysql-test/suite/pbxt/r/range.result range.result-20090402100035-4ilk9i91sh65vjcb-132 mysql-test/suite/pbxt/r/schema.result schema.result-20090402100035-4ilk9i91sh65vjcb-138 mysql-test/suite/pbxt/r/select.result select.result-20090402100035-4ilk9i91sh65vjcb-139 mysql-test/suite/pbxt/r/select_safe.result select_safe.result-20090402100035-4ilk9i91sh65vjcb-141 mysql-test/suite/pbxt/r/subselect.result subselect.result-20090402100035-4ilk9i91sh65vjcb-146 mysql-test/suite/pbxt/r/type_enum.result type_enum.result-20090402100035-4ilk9i91sh65vjcb-155 mysql-test/suite/pbxt/r/type_ranges.result type_ranges.result-20090402100035-4ilk9i91sh65vjcb-159 mysql-test/suite/pbxt/r/type_timestamp.result type_timestamp.resul-20090402100035-4ilk9i91sh65vjcb-162 mysql-test/suite/pbxt/r/union.result union.result-20090402100035-4ilk9i91sh65vjcb-166 mysql-test/suite/pbxt/r/view_grant.result view_grant.result-20090402100035-4ilk9i91sh65vjcb-169 mysql-test/suite/pbxt/t/auto_increment.test auto_increment.test-20090402100035-4ilk9i91sh65vjcb-176 mysql-test/suite/pbxt/t/delete.test delete.test-20090402100035-4ilk9i91sh65vjcb-198 mysql-test/suite/pbxt/t/join_nested.test join_nested.test-20090402100035-4ilk9i91sh65vjcb-248 mysql-test/suite/pbxt/t/null.test null.test-20090402100035-4ilk9i91sh65vjcb-271 mysql-test/suite/pbxt/t/pbxt_bugs.test pbxt_bugs.test-20090402100035-4ilk9i91sh65vjcb-287 mysql-test/suite/pbxt/t/rename.test rename.test-20090402100035-4ilk9i91sh65vjcb-301 mysql-test/suite/pbxt/t/schema.test schema.test-20090402100035-4ilk9i91sh65vjcb-305 mysql-test/suite/pbxt/t/type_enum.test type_enum.test-20090402100035-4ilk9i91sh65vjcb-322 mysql-test/suite/pbxt/t/union.test union.test-20090402100035-4ilk9i91sh65vjcb-333 storage/pbxt/ChangeLog changelog-20090326121724-x683v32twzr3fi0y-3 storage/pbxt/src/Makefile.am makefile.am-20090326121724-x683v32twzr3fi0y-13 storage/pbxt/src/cache_xt.cc cache_xt.cc-20090326121724-x683v32twzr3fi0y-16 storage/pbxt/src/cache_xt.h cache_xt.h-20090326121724-x683v32twzr3fi0y-17 storage/pbxt/src/ccutils_xt.cc ccutils_xt.cc-20090326121724-x683v32twzr3fi0y-18 storage/pbxt/src/database_xt.cc database_xt.cc-20090326121724-x683v32twzr3fi0y-20 storage/pbxt/src/datadic_xt.cc datadic_xt.cc-20090326121724-x683v32twzr3fi0y-22 storage/pbxt/src/datadic_xt.h datadic_xt.h-20090326121724-x683v32twzr3fi0y-23 storage/pbxt/src/datalog_xt.cc datalog_xt.cc-20090326121724-x683v32twzr3fi0y-24 storage/pbxt/src/datalog_xt.h datalog_xt.h-20090326121724-x683v32twzr3fi0y-25 storage/pbxt/src/discover_xt.cc discover_xt.cc-20090326121724-x683v32twzr3fi0y-26 storage/pbxt/src/filesys_xt.cc filesys_xt.cc-20090326121724-x683v32twzr3fi0y-28 storage/pbxt/src/filesys_xt.h filesys_xt.h-20090326121724-x683v32twzr3fi0y-29 storage/pbxt/src/ha_pbxt.cc ha_pbxt.cc-20090326121724-x683v32twzr3fi0y-30 storage/pbxt/src/ha_pbxt.h ha_pbxt.h-20090326121724-x683v32twzr3fi0y-31 storage/pbxt/src/ha_xtsys.cc ha_xtsys.cc-20090326121724-x683v32twzr3fi0y-32 storage/pbxt/src/ha_xtsys.h ha_xtsys.h-20090326121724-x683v32twzr3fi0y-33 storage/pbxt/src/hashtab_xt.cc hashtab_xt.cc-20090326121724-x683v32twzr3fi0y-34 storage/pbxt/src/heap_xt.cc heap_xt.cc-20090326121724-x683v32twzr3fi0y-36 storage/pbxt/src/heap_xt.h heap_xt.h-20090326121724-x683v32twzr3fi0y-37 storage/pbxt/src/index_xt.cc index_xt.cc-20090326121724-x683v32twzr3fi0y-38 storage/pbxt/src/index_xt.h index_xt.h-20090326121724-x683v32twzr3fi0y-39 storage/pbxt/src/lock_xt.cc lock_xt.cc-20090326121724-x683v32twzr3fi0y-42 storage/pbxt/src/lock_xt.h lock_xt.h-20090326121724-x683v32twzr3fi0y-43 storage/pbxt/src/locklist_xt.cc locklist_xt.cc-20090326121724-x683v32twzr3fi0y-44 storage/pbxt/src/locklist_xt.h locklist_xt.h-20090326121724-x683v32twzr3fi0y-45 storage/pbxt/src/memory_xt.cc memory_xt.cc-20090326121724-x683v32twzr3fi0y-46 storage/pbxt/src/memory_xt.h memory_xt.h-20090326121724-x683v32twzr3fi0y-47 storage/pbxt/src/myxt_xt.cc myxt_xt.cc-20090326121724-x683v32twzr3fi0y-48 storage/pbxt/src/myxt_xt.h myxt_xt.h-20090326121724-x683v32twzr3fi0y-49 storage/pbxt/src/pbms.h pbms.h-20090326121724-x683v32twzr3fi0y-50 storage/pbxt/src/pthread_xt.cc pthread_xt.cc-20090326121724-x683v32twzr3fi0y-51 storage/pbxt/src/restart_xt.cc restart_xt.cc-20090326121724-x683v32twzr3fi0y-53 storage/pbxt/src/restart_xt.h restart_xt.h-20090326121724-x683v32twzr3fi0y-54 storage/pbxt/src/sortedlist_xt.cc sortedlist_xt.cc-20090326121724-x683v32twzr3fi0y-55 storage/pbxt/src/strutil_xt.cc strutil_xt.cc-20090326121724-x683v32twzr3fi0y-59 storage/pbxt/src/systab_xt.cc systab_xt.cc-20090326121724-x683v32twzr3fi0y-61 storage/pbxt/src/systab_xt.h systab_xt.h-20090326121724-x683v32twzr3fi0y-62 storage/pbxt/src/tabcache_xt.cc tabcache_xt.cc-20090326121724-x683v32twzr3fi0y-63 storage/pbxt/src/tabcache_xt.h tabcache_xt.h-20090326121724-x683v32twzr3fi0y-64 storage/pbxt/src/table_xt.cc table_xt.cc-20090326121724-x683v32twzr3fi0y-65 storage/pbxt/src/table_xt.h table_xt.h-20090326121724-x683v32twzr3fi0y-66 storage/pbxt/src/thread_xt.cc thread_xt.cc-20090326121724-x683v32twzr3fi0y-67 storage/pbxt/src/thread_xt.h thread_xt.h-20090326121724-x683v32twzr3fi0y-68 storage/pbxt/src/trace_xt.cc trace_xt.cc-20090326121724-x683v32twzr3fi0y-69 storage/pbxt/src/trace_xt.h trace_xt.h-20090326121724-x683v32twzr3fi0y-70 storage/pbxt/src/util_xt.cc util_xt.cc-20090326121724-x683v32twzr3fi0y-71 storage/pbxt/src/xaction_xt.cc xaction_xt.cc-20090326121724-x683v32twzr3fi0y-74 storage/pbxt/src/xaction_xt.h xaction_xt.h-20090326121724-x683v32twzr3fi0y-75 storage/pbxt/src/xactlog_xt.cc xactlog_xt.cc-20090326121724-x683v32twzr3fi0y-76 storage/pbxt/src/xactlog_xt.h xactlog_xt.h-20090326121724-x683v32twzr3fi0y-77 storage/pbxt/src/xt_config.h xt_config.h-20090326121724-x683v32twzr3fi0y-78 storage/pbxt/src/xt_defs.h xt_defs.h-20090326121724-x683v32twzr3fi0y-79 ------------------------------------------------------------ revno: 2719.2.4 revision-id: knielsen@knielsen-hq.org-20090831110744-ru07dzndci7cf92k parent: paul.mccullagh@primebase.org-20090818074653-8mbinxoo0ylqqqr9 committer: knielsen@knielsen-hq.org branch nick: maria-pbxt-rc2 timestamp: Mon 2009-08-31 13:07:44 +0200 message: PBXT merge fixes. - Disable PBMS in MariaDB (as per recommendation of Paul). - Add missing *-master.opt files to make testsuite work on case-sensitive file systems. - Result file updates. added: mysql-test/suite/pbxt/t/lowercase_table_grant-master.opt lowercase_table_gran-20090828130852-3duj73io0g345hxj-1 mysql-test/suite/pbxt/t/lowercase_table_qcache-master.opt lowercase_table_qcac-20090828130852-3duj73io0g345hxj-2 mysql-test/suite/pbxt/t/lowercase_view-master.opt lowercase_viewmaster-20090828130852-3duj73io0g345hxj-3 mysql-test/suite/pbxt/t/udf-master.opt udfmaster.opt-20090828130852-3duj73io0g345hxj-4 modified: mysql-test/suite/pbxt/r/lowercase_view.result lowercase_view.resul-20090402100035-4ilk9i91sh65vjcb-96 mysql-test/suite/pbxt/r/ps_1general.result ps_1general.result-20090402100035-4ilk9i91sh65vjcb-130 storage/pbxt/src/Makefile.am makefile.am-20090326121724-x683v32twzr3fi0y-13 storage/pbxt/src/xt_config.h xt_config.h-20090326121724-x683v32twzr3fi0y-78 ------------------------------------------------------------ revno: 2719.2.3 revision-id: paul.mccullagh@primebase.org-20090818074653-8mbinxoo0ylqqqr9 parent: paul.mccullagh@primebase.org-20090817155758-zliin5rbosn30az8 committer: Paul McCullagh <paul.mccullagh@primebase.org> branch nick: trunk timestamp: Tue 2009-08-18 09:46:53 +0200 message: Merged changes for bug fix update 1.0.08c RC2 removed: storage/pbxt/src/streaming_xt.cc streaming_xt.cc-20090326121724-x683v32twzr3fi0y-57 storage/pbxt/src/streaming_xt.h streaming_xt.h-20090326121724-x683v32twzr3fi0y-58 added: storage/pbxt/src/pbms_enabled.cc pbms_enabled.cc-20090818074502-tybcb62hp1kdrk3l-1 storage/pbxt/src/pbms_enabled.h pbms_enabled.h-20090818074502-tybcb62hp1kdrk3l-2 modified: storage/pbxt/ChangeLog changelog-20090326121724-x683v32twzr3fi0y-3 storage/pbxt/src/datadic_xt.cc datadic_xt.cc-20090326121724-x683v32twzr3fi0y-22 storage/pbxt/src/datadic_xt.h datadic_xt.h-20090326121724-x683v32twzr3fi0y-23 storage/pbxt/src/datalog_xt.cc datalog_xt.cc-20090326121724-x683v32twzr3fi0y-24 storage/pbxt/src/datalog_xt.h datalog_xt.h-20090326121724-x683v32twzr3fi0y-25 storage/pbxt/src/filesys_xt.cc filesys_xt.cc-20090326121724-x683v32twzr3fi0y-28 storage/pbxt/src/ha_pbxt.cc ha_pbxt.cc-20090326121724-x683v32twzr3fi0y-30 storage/pbxt/src/index_xt.cc index_xt.cc-20090326121724-x683v32twzr3fi0y-38 storage/pbxt/src/myxt_xt.cc myxt_xt.cc-20090326121724-x683v32twzr3fi0y-48 storage/pbxt/src/myxt_xt.h myxt_xt.h-20090326121724-x683v32twzr3fi0y-49 storage/pbxt/src/pbms.h pbms.h-20090326121724-x683v32twzr3fi0y-50 storage/pbxt/src/pthread_xt.cc pthread_xt.cc-20090326121724-x683v32twzr3fi0y-51 storage/pbxt/src/restart_xt.cc restart_xt.cc-20090326121724-x683v32twzr3fi0y-53 storage/pbxt/src/strutil_xt.cc strutil_xt.cc-20090326121724-x683v32twzr3fi0y-59 storage/pbxt/src/table_xt.cc table_xt.cc-20090326121724-x683v32twzr3fi0y-65 storage/pbxt/src/table_xt.h table_xt.h-20090326121724-x683v32twzr3fi0y-66 storage/pbxt/src/xactlog_xt.cc xactlog_xt.cc-20090326121724-x683v32twzr3fi0y-76 storage/pbxt/src/xt_config.h xt_config.h-20090326121724-x683v32twzr3fi0y-78 ------------------------------------------------------------ revno: 2719.2.2 revision-id: paul.mccullagh@primebase.org-20090817155758-zliin5rbosn30az8 parent: paul.mccullagh@primebase.org-20090817111236-1pgxzp5x9l74q0ug committer: Paul McCullagh <paul.mccullagh@primebase.org> branch nick: trunk timestamp: Mon 2009-08-17 17:57:58 +0200 message: Updated all tests for RC2 modified: mysql-test/suite/pbxt/r/analyze.result analyze.result-20090402100035-4ilk9i91sh65vjcb-7 mysql-test/suite/pbxt/r/auto_increment.result auto_increment.resul-20090402100035-4ilk9i91sh65vjcb-9 mysql-test/suite/pbxt/r/delete.result delete.result-20090402100035-4ilk9i91sh65vjcb-31 mysql-test/suite/pbxt/r/distinct.result distinct.result-20090402100035-4ilk9i91sh65vjcb-34 mysql-test/suite/pbxt/r/func_group.result func_group.result-20090402100035-4ilk9i91sh65vjcb-50 mysql-test/suite/pbxt/r/func_math.result func_math.result-20090402100035-4ilk9i91sh65vjcb-55 mysql-test/suite/pbxt/r/func_str.result func_str.result-20090402100035-4ilk9i91sh65vjcb-61 mysql-test/suite/pbxt/r/grant.result grant.result-20090402100035-4ilk9i91sh65vjcb-65 mysql-test/suite/pbxt/r/group_min_max.result group_min_max.result-20090402100035-4ilk9i91sh65vjcb-69 mysql-test/suite/pbxt/r/join.result join.result-20090402100035-4ilk9i91sh65vjcb-79 mysql-test/suite/pbxt/r/join_nested.result join_nested.result-20090402100035-4ilk9i91sh65vjcb-81 mysql-test/suite/pbxt/r/key.result key.result-20090402100035-4ilk9i91sh65vjcb-83 mysql-test/suite/pbxt/r/key_cache.result key_cache.result-20090402100035-4ilk9i91sh65vjcb-84 mysql-test/suite/pbxt/r/key_diff.result key_diff.result-20090402100035-4ilk9i91sh65vjcb-85 mysql-test/suite/pbxt/r/mysqlshow.result mysqlshow.result-20090402100035-4ilk9i91sh65vjcb-101 mysql-test/suite/pbxt/r/null.result null.result-20090402100035-4ilk9i91sh65vjcb-104 mysql-test/suite/pbxt/r/null_key.result null_key.result-20090402100035-4ilk9i91sh65vjcb-105 mysql-test/suite/pbxt/r/partition_pruning.result partition_pruning.re-20090402100035-4ilk9i91sh65vjcb-117 mysql-test/suite/pbxt/r/pbxt_bugs.result pbxt_bugs.result-20090402100035-4ilk9i91sh65vjcb-120 mysql-test/suite/pbxt/r/pbxt_ref_int.result pbxt_ref_int.result-20090402100035-4ilk9i91sh65vjcb-123 mysql-test/suite/pbxt/r/preload.result preload.result-20090402100035-4ilk9i91sh65vjcb-127 mysql-test/suite/pbxt/r/ps_1general.result ps_1general.result-20090402100035-4ilk9i91sh65vjcb-130 mysql-test/suite/pbxt/r/range.result range.result-20090402100035-4ilk9i91sh65vjcb-132 mysql-test/suite/pbxt/r/schema.result schema.result-20090402100035-4ilk9i91sh65vjcb-138 mysql-test/suite/pbxt/r/select.result select.result-20090402100035-4ilk9i91sh65vjcb-139 mysql-test/suite/pbxt/r/select_safe.result select_safe.result-20090402100035-4ilk9i91sh65vjcb-141 mysql-test/suite/pbxt/r/subselect.result subselect.result-20090402100035-4ilk9i91sh65vjcb-146 mysql-test/suite/pbxt/r/type_enum.result type_enum.result-20090402100035-4ilk9i91sh65vjcb-155 mysql-test/suite/pbxt/r/type_ranges.result type_ranges.result-20090402100035-4ilk9i91sh65vjcb-159 mysql-test/suite/pbxt/r/type_timestamp.result type_timestamp.resul-20090402100035-4ilk9i91sh65vjcb-162 mysql-test/suite/pbxt/r/union.result union.result-20090402100035-4ilk9i91sh65vjcb-166 mysql-test/suite/pbxt/r/view_grant.result view_grant.result-20090402100035-4ilk9i91sh65vjcb-169 mysql-test/suite/pbxt/t/auto_increment.test auto_increment.test-20090402100035-4ilk9i91sh65vjcb-176 mysql-test/suite/pbxt/t/delete.test delete.test-20090402100035-4ilk9i91sh65vjcb-198 mysql-test/suite/pbxt/t/join_nested.test join_nested.test-20090402100035-4ilk9i91sh65vjcb-248 mysql-test/suite/pbxt/t/null.test null.test-20090402100035-4ilk9i91sh65vjcb-271 mysql-test/suite/pbxt/t/pbxt_bugs.test pbxt_bugs.test-20090402100035-4ilk9i91sh65vjcb-287 mysql-test/suite/pbxt/t/rename.test rename.test-20090402100035-4ilk9i91sh65vjcb-301 mysql-test/suite/pbxt/t/schema.test schema.test-20090402100035-4ilk9i91sh65vjcb-305 mysql-test/suite/pbxt/t/type_enum.test type_enum.test-20090402100035-4ilk9i91sh65vjcb-322 mysql-test/suite/pbxt/t/union.test union.test-20090402100035-4ilk9i91sh65vjcb-333 ------------------------------------------------------------ revno: 2719.2.1 revision-id: paul.mccullagh@primebase.org-20090817111236-1pgxzp5x9l74q0ug parent: knielsen@knielsen-hq.org-20090805072137-wg97dcem1cxnzt3p committer: Paul McCullagh <paul.mccullagh@primebase.org> branch nick: trunk timestamp: Mon 2009-08-17 13:12:36 +0200 message: Updated PBXT to version 1.0.08 RC2 modified: mysql-test/suite/pbxt/r/alter_table.result alter_table.result-20090402100035-4ilk9i91sh65vjcb-5 storage/pbxt/ChangeLog changelog-20090326121724-x683v32twzr3fi0y-3 storage/pbxt/src/cache_xt.cc cache_xt.cc-20090326121724-x683v32twzr3fi0y-16 storage/pbxt/src/cache_xt.h cache_xt.h-20090326121724-x683v32twzr3fi0y-17 storage/pbxt/src/ccutils_xt.cc ccutils_xt.cc-20090326121724-x683v32twzr3fi0y-18 storage/pbxt/src/database_xt.cc database_xt.cc-20090326121724-x683v32twzr3fi0y-20 storage/pbxt/src/datadic_xt.cc datadic_xt.cc-20090326121724-x683v32twzr3fi0y-22 storage/pbxt/src/datadic_xt.h datadic_xt.h-20090326121724-x683v32twzr3fi0y-23 storage/pbxt/src/datalog_xt.cc datalog_xt.cc-20090326121724-x683v32twzr3fi0y-24 storage/pbxt/src/discover_xt.cc discover_xt.cc-20090326121724-x683v32twzr3fi0y-26 storage/pbxt/src/filesys_xt.cc filesys_xt.cc-20090326121724-x683v32twzr3fi0y-28 storage/pbxt/src/filesys_xt.h filesys_xt.h-20090326121724-x683v32twzr3fi0y-29 storage/pbxt/src/ha_pbxt.cc ha_pbxt.cc-20090326121724-x683v32twzr3fi0y-30 storage/pbxt/src/ha_pbxt.h ha_pbxt.h-20090326121724-x683v32twzr3fi0y-31 storage/pbxt/src/ha_xtsys.cc ha_xtsys.cc-20090326121724-x683v32twzr3fi0y-32 storage/pbxt/src/ha_xtsys.h ha_xtsys.h-20090326121724-x683v32twzr3fi0y-33 storage/pbxt/src/hashtab_xt.cc hashtab_xt.cc-20090326121724-x683v32twzr3fi0y-34 storage/pbxt/src/heap_xt.cc heap_xt.cc-20090326121724-x683v32twzr3fi0y-36 storage/pbxt/src/heap_xt.h heap_xt.h-20090326121724-x683v32twzr3fi0y-37 storage/pbxt/src/index_xt.cc index_xt.cc-20090326121724-x683v32twzr3fi0y-38 storage/pbxt/src/index_xt.h index_xt.h-20090326121724-x683v32twzr3fi0y-39 storage/pbxt/src/lock_xt.cc lock_xt.cc-20090326121724-x683v32twzr3fi0y-42 storage/pbxt/src/lock_xt.h lock_xt.h-20090326121724-x683v32twzr3fi0y-43 storage/pbxt/src/locklist_xt.cc locklist_xt.cc-20090326121724-x683v32twzr3fi0y-44 storage/pbxt/src/locklist_xt.h locklist_xt.h-20090326121724-x683v32twzr3fi0y-45 storage/pbxt/src/memory_xt.cc memory_xt.cc-20090326121724-x683v32twzr3fi0y-46 storage/pbxt/src/memory_xt.h memory_xt.h-20090326121724-x683v32twzr3fi0y-47 storage/pbxt/src/myxt_xt.cc myxt_xt.cc-20090326121724-x683v32twzr3fi0y-48 storage/pbxt/src/myxt_xt.h myxt_xt.h-20090326121724-x683v32twzr3fi0y-49 storage/pbxt/src/pbms.h pbms.h-20090326121724-x683v32twzr3fi0y-50 storage/pbxt/src/restart_xt.cc restart_xt.cc-20090326121724-x683v32twzr3fi0y-53 storage/pbxt/src/restart_xt.h restart_xt.h-20090326121724-x683v32twzr3fi0y-54 storage/pbxt/src/sortedlist_xt.cc sortedlist_xt.cc-20090326121724-x683v32twzr3fi0y-55 storage/pbxt/src/streaming_xt.cc streaming_xt.cc-20090326121724-x683v32twzr3fi0y-57 storage/pbxt/src/strutil_xt.cc strutil_xt.cc-20090326121724-x683v32twzr3fi0y-59 storage/pbxt/src/systab_xt.cc systab_xt.cc-20090326121724-x683v32twzr3fi0y-61 storage/pbxt/src/systab_xt.h systab_xt.h-20090326121724-x683v32twzr3fi0y-62 storage/pbxt/src/tabcache_xt.cc tabcache_xt.cc-20090326121724-x683v32twzr3fi0y-63 storage/pbxt/src/tabcache_xt.h tabcache_xt.h-20090326121724-x683v32twzr3fi0y-64 storage/pbxt/src/table_xt.cc table_xt.cc-20090326121724-x683v32twzr3fi0y-65 storage/pbxt/src/table_xt.h table_xt.h-20090326121724-x683v32twzr3fi0y-66 storage/pbxt/src/thread_xt.cc thread_xt.cc-20090326121724-x683v32twzr3fi0y-67 storage/pbxt/src/thread_xt.h thread_xt.h-20090326121724-x683v32twzr3fi0y-68 storage/pbxt/src/trace_xt.cc trace_xt.cc-20090326121724-x683v32twzr3fi0y-69 storage/pbxt/src/trace_xt.h trace_xt.h-20090326121724-x683v32twzr3fi0y-70 storage/pbxt/src/util_xt.cc util_xt.cc-20090326121724-x683v32twzr3fi0y-71 storage/pbxt/src/xaction_xt.cc xaction_xt.cc-20090326121724-x683v32twzr3fi0y-74 storage/pbxt/src/xaction_xt.h xaction_xt.h-20090326121724-x683v32twzr3fi0y-75 storage/pbxt/src/xactlog_xt.cc xactlog_xt.cc-20090326121724-x683v32twzr3fi0y-76 storage/pbxt/src/xactlog_xt.h xactlog_xt.h-20090326121724-x683v32twzr3fi0y-77 storage/pbxt/src/xt_config.h xt_config.h-20090326121724-x683v32twzr3fi0y-78 storage/pbxt/src/xt_defs.h xt_defs.h-20090326121724-x683v32twzr3fi0y-79 ------------------------------------------------------------ revno: 2719.1.2 revision-id: knielsen@knielsen-hq.org-20090829194804-rfq9dbai99do12ub parent: knielsen@knielsen-hq.org-20090829190446-bm072wpuvueu2o59 committer: knielsen@knielsen-hq.org branch nick: mariadb-5.1 timestamp: Sat 2009-08-29 21:48:04 +0200 message: Add missign header file to `make dist`. modified: storage/xtradb/Makefile.am makefile.am-20081201061010-zymrrwrczns2vrex-4 ------------------------------------------------------------ revno: 2719.1.1 revision-id: knielsen@knielsen-hq.org-20090829190446-bm072wpuvueu2o59 parent: knielsen@knielsen-hq.org-20090805072137-wg97dcem1cxnzt3p committer: knielsen@knielsen-hq.org branch nick: 5.1 timestamp: Sat 2009-08-29 21:04:46 +0200 message: Fix `make dist` after solaris build file fixes. Solaris build scripts under BUILD/ were changed, but Makefile.am was not updated to reflect the new set of file names. modified: BUILD/Makefile.am sp1f-makefile.am-20020102192940-dza66ux2yxyklupzjz4q3km3hvye5rnj Diff too large for email (15664 lines, the limit is 1000).