[Commits] Rev 2942: Merge in file:///home/igor/maria/maria-5.1-wl24/

igor at askmonty.org igor at askmonty.org
Thu Sep 23 05:10:25 EEST 2010


At file:///home/igor/maria/maria-5.1-wl24/

------------------------------------------------------------
revno: 2942 [merge]
revision-id: igor at askmonty.org-20100923021019-00gm71oprlls39zm
parent: igor at askmonty.org-20100920193941-kirxqacsw500ihc1
parent: igor at askmonty.org-20100915234256-pe6cj5e0u0zkms04
committer: Igor Babaev <igor at askmonty.org>
branch nick: maria-5.1-wl24
timestamp: Wed 2010-09-22 19:10:19 -0700
message:
  Merge
added:
  mysql-test/include/world.inc   world.inc-20091012044543-93w7vwraq59hy86r-1
  mysql-test/include/world_schema.inc world_schema.inc-20091012044534-kcnc9aq3uxevbglx-1
  mysql-test/r/range_vs_index_merge.result range_vs_index_merge-20091012044448-yb3s5ffmp6m60y3r-1
  mysql-test/r/range_vs_index_merge_innodb.result range_vs_index_merge-20091012044457-ng2xbpvlta5mfvs2-1
  mysql-test/t/range_vs_index_merge.test range_vs_index_merge-20091012044353-5lvq3s1z3z60wdt8-1
  mysql-test/t/range_vs_index_merge_innodb.test range_vs_index_merge-20091012044414-i13iupnmsjn3esze-1
modified:
  mysql-test/r/index_merge_myisam.result sp1f-index_merge_myisam.r-20060816114353-wd2664hjxwyjdvm4snup647av5fmxfln
  sql/opt_range.cc               sp1f-opt_range.cc-19700101030959-afe3wtevb7zwrg4xyibt35uamov5r7ds
  sql/sql_list.h                 sp1f-sql_list.h-19700101030959-hyddr5nvvtrgbk7llgnah4i4bf6ugspn
-------------- next part --------------

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


More information about the commits mailing list