[Commits] Rev 2908: Automatic merge with 5.1 in lp:maria/5.2

Michael Widenius monty at askmonty.org
Mon Jan 10 23:42:55 EET 2011


At lp:maria/5.2

------------------------------------------------------------
revno: 2908 [merge]
revision-id: monty at askmonty.org-20110110214247-shyun94ujj33pged
parent: monty at askmonty.org-20110107160722-sip4hgzk0092drd8
parent: monty at askmonty.org-20110110212240-1lg7dgzku0r4ly1m
committer: Michael Widenius <monty at askmonty.org>
branch nick: maria-5.2
timestamp: Mon 2011-01-10 23:42:47 +0200
message:
  Automatic merge with 5.1
added:
  mysql-test/suite/handler/      handler-20110110195753-v0ut2q32diiciq0l-1
  mysql-test/suite/handler/aria.result aria.result-20110110202255-0y5taa9x847d6os7-1
  mysql-test/suite/handler/aria.test aria.test-20110110202255-0y5taa9x847d6os7-2
  mysql-test/suite/handler/init.inc init.inc-20110110202255-0y5taa9x847d6os7-3
  mysql-test/suite/handler/interface.result interface.result-20110110202255-0y5taa9x847d6os7-4
  mysql-test/suite/handler/interface.test interface.test-20110110202306-yvttuyjos57x7jcm-1
renamed:
  mysql-test/include/handler.inc => mysql-test/suite/handler/handler.inc sp1f-handler.test-20010406221832-gfvg6n4rp4py6lunazzembziuu5qxvi5
  mysql-test/r/handler_innodb.result => mysql-test/suite/handler/innodb.result sp1f-innodb_handler.resul-20020821205505-jopsqbjuqwwxb5hvf3r2wn37vobunxru
  mysql-test/r/handler_myisam.result => mysql-test/suite/handler/myisam.result sp1f-handler.result-20010406221832-ybo3cgjo6qapqc6776ivjpdngwmk6plu
  mysql-test/t/handler_innodb.test => mysql-test/suite/handler/innodb.test sp1f-innodb_handler.test-20020821205505-gwqk7yb24jcfxay37a2svxwwoqq4ybdr
  mysql-test/t/handler_myisam.test => mysql-test/suite/handler/myisam.test sp1f-handler_myisam.test-20060816103641-ckpb4przkqjb63gycdafwpu6hkuus3rj
modified:
  mysql-test/Makefile.am         sp1f-makefile.am-20001206082022-36vvdlhec52v4kcxab5ees7yomxvj4dl
  mysql-test/mysql-test-run.pl   sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3
  mysql-test/r/lock_multi.result sp1f-lock_multi.result-20011008015806-j56mw7cxenwk7wmwzgciunzotxn2oopp
  mysql-test/t/lock_multi.test   sp1f-lock_multi.test-20011008015806-67rpwlsigaymaevma2l42r5edbtot3fp
  mysys/tree.c                   sp1f-tree.c-19700101030959-febyd36tcwqmhiyrrcuaqate66xykgg3
  sql/handler.cc                 sp1f-handler.cc-19700101030959-ta6zfrlbxzucylciyro3musjsdpocrdh
  sql/handler.h                  sp1f-handler.h-19700101030959-mumq2hpilkpgxuf22ftyv5kbilysnzvn
  sql/sql_handler.cc             sp1f-sql_handler.cc-20010406221833-l4tsiortoyipmoyajcoz2tcdppvyeltl
  storage/maria/ma_extra.c       sp1f-ma_extra.c-20060411134414-odsjlm2dvwmrpwdcyu3eqmkilaatl3gb
  storage/maria/ma_ft_boolean_search.c sp1f-ma_ft_boolean_search-20060411134414-l4bscelblvehls4cor5iwq3lbxkj4zwx
  storage/maria/ma_open.c        sp1f-ma_open.c-20060411134425-47m3424sotlyyl5b3k5brotxm23ryffh
  storage/maria/ma_rkey.c        sp1f-ma_rkey.c-20060411134430-uvwfeqz5doebhdmjmb2yvcactm5q4qyx
  storage/maria/ma_rnext.c       sp1f-ma_rnext.c-20060411134431-nu574hnvixegeil36xyonerkkcosethq
  storage/maria/ma_rsame.c       sp1f-ma_rsame.c-20060411134434-mo64l7qb4fg2vgayeyu4l55vate2w6lk
  storage/maria/ma_search.c      sp1f-ma_search.c-20060411134442-haqjkc7jzp7zkt3fejfz4bdvhobo734v
  storage/maria/ma_unique.c      sp1f-ma_unique.c-20060411134448-en4xsk2ceozgyrrgoqlw4hk26hkxgofc
  mysql-test/suite/handler/handler.inc sp1f-handler.test-20010406221832-gfvg6n4rp4py6lunazzembziuu5qxvi5
  mysql-test/suite/handler/innodb.result sp1f-innodb_handler.resul-20020821205505-jopsqbjuqwwxb5hvf3r2wn37vobunxru
  mysql-test/suite/handler/myisam.result sp1f-handler.result-20010406221832-ybo3cgjo6qapqc6776ivjpdngwmk6plu
  mysql-test/suite/handler/innodb.test sp1f-innodb_handler.test-20020821205505-gwqk7yb24jcfxay37a2svxwwoqq4ybdr
  mysql-test/suite/handler/myisam.test sp1f-handler_myisam.test-20060816103641-ckpb4przkqjb63gycdafwpu6hkuus3rj
-------------- next part --------------

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


More information about the commits mailing list