[Commits] Rev 2943: merge in http://bazaar.launchpad.net/~maria-captains/maria/5.1/

serg at askmonty.org serg at askmonty.org
Tue Sep 28 16:46:38 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1/

------------------------------------------------------------
revno: 2943 [merge]
revision-id: sergii at pisem.net-20100928134630-vcr9eufq4qvsdy3q
parent: sergii at pisem.net-20100921153236-3hghga0smcm8ym63
parent: monty at askmonty.org-20100928130545-bh6mneiofvw7ho6x
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.1
timestamp: Tue 2010-09-28 15:46:30 +0200
message:
  merge
modified:
  mysql-test/r/index_merge_innodb.result sp1f-index_merge_innodb.r-20060816114352-umgqkfavfljswrg7qhdkcoptdwi5gipo
  mysql-test/r/join_outer.result sp1f-join_outer.result-20001228015633-vk2jshiracfus3ze2d2bim2csnnrc5us
  mysql-test/suite/pbxt/r/negation_elimination.result negation_elimination-20090402100035-4ilk9i91sh65vjcb-103
  mysql-test/suite/pbxt/r/select.result select.result-20090402100035-4ilk9i91sh65vjcb-139
  mysql-test/t/index_merge_innodb.test sp1f-index_merge_innodb.t-20060816114353-jlqkbce4q5pp3yqqhbhrox4ovfz3yce4
  mysql-test/t/join_outer.test   sp1f-join_outer.test-20001228015636-himrcptylaquy6l5d7pl7pawom3ytmtw
  sql/item.h                     sp1f-item.h-19700101030959-rrkb43htudd62batmoteashkebcwykpa
  sql/records.cc                 sp1f-records.cc-19700101030959-xg6elqzdqhvrmobazxrjajmiyqxf7lx7
  sql/sql_select.cc              sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
  sql/sql_select.h               sp1f-sql_select.h-19700101030959-oqegfxr76xlgmrzd6qlevonoibfnwzoz
  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/database_xt.h database_xt.h-20090326121724-x683v32twzr3fi0y-21
  storage/pbxt/src/datadic_xt.cc datadic_xt.cc-20090326121724-x683v32twzr3fi0y-22
  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/ha_pbxt.cc    ha_pbxt.cc-20090326121724-x683v32twzr3fi0y-30
  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/myxt_xt.cc    myxt_xt.cc-20090326121724-x683v32twzr3fi0y-48
  storage/pbxt/src/myxt_xt.h     myxt_xt.h-20090326121724-x683v32twzr3fi0y-49
  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/thread_xt.cc  thread_xt.cc-20090326121724-x683v32twzr3fi0y-67
  storage/pbxt/src/xaction_xt.cc xaction_xt.cc-20090326121724-x683v32twzr3fi0y-74
  storage/pbxt/src/xt_defs.h     xt_defs.h-20090326121724-x683v32twzr3fi0y-79
-------------- next part --------------

Diff too large for email (2048 lines, the limit is 2000).


More information about the commits mailing list