[Commits] Rev 2854: Automatic merge in lp:maria/5.3

Michael Widenius monty at askmonty.org
Sun Nov 28 14:39:02 EET 2010


At lp:maria/5.3

------------------------------------------------------------
revno: 2854 [merge]
revision-id: monty at askmonty.org-20101128123859-ctg8g3verq4ivhn4
parent: timour at askmonty.org-20101124223450-zv9301d7v5t4rot5
parent: monty at askmonty.org-20101127152952-imoow7srhvm4j4l7
committer: Michael Widenius <monty at askmonty.org>
branch nick: maria-5.3
timestamp: Sun 2010-11-28 14:38:59 +0200
message:
  Automatic merge
modified:
  mysql-test/suite/maria/r/compat_aliases.result compat_aliases.resul-20100913130816-c7x3ogvq64zx9vpj-1
  mysql-test/suite/maria/t/compat_aliases.test compat_aliases.test-20100913130816-c7x3ogvq64zx9vpj-3
  mysys/safemalloc.c             sp1f-safemalloc.c-19700101030959-lzukndsycy7ifkiblxgakgzfmfevnjau
  sql/event_db_repository.cc     sp1f-event_db_repository.-20060627064838-k6rpjg72omnihtxhbubu6ht7wjvxggb7
  sql/event_scheduler.cc         sp1f-event_scheduler.cc-20060522184601-btrj3nnnhmns6ciogy2l5aueg53vywzf
  sql/events.cc                  sp1f-event.cc-20051202122200-as66hughd4bhrhu2uqbb6mpogou2yihk
  sql/field.cc                   sp1f-field.cc-19700101030959-f4imaofclsea3n4fj4ow5m7havmyxa2r
  sql/field.h                    sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
  sql/ha_partition.cc            sp1f-ha_partition.cc-20050718113037-eoky4qluumb5dmdyg5z6n2fvdkgutxms
  sql/handler.cc                 sp1f-handler.cc-19700101030959-ta6zfrlbxzucylciyro3musjsdpocrdh
  sql/handler.h                  sp1f-handler.h-19700101030959-mumq2hpilkpgxuf22ftyv5kbilysnzvn
  sql/item.cc                    sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn
  sql/item_buff.cc               sp1f-item_buff.cc-19700101030959-yxrkkjvc7fghc4a2dzccoptxf3fcoblj
  sql/item_func.cc               sp1f-item_func.cc-19700101030959-3wmsx76yvc25sroqpfrx2n77kqdxxn3y
  sql/item_sum.h                 sp1f-item_sum.h-19700101030959-ecgohlekwm355wxl5fv4zzq3alalbwyl
  sql/key.cc                     sp1f-key.cc-19700101030959-are4n4gcbltuapzes3nqirfwlls4w3p3
  sql/lock.cc                    sp1f-lock.cc-19700101030959-lzrt5tyolna3dcihuenjh7nlicr7llt7
  sql/log.cc                     sp1f-log.cc-19700101030959-r3hdfovek4kl6nd64ovoaknmirota6bq
  sql/log_event.cc               sp1f-log_event.cc-19700101030959-msmqlflsngxosswid2hpzxly5vfqdddc
  sql/net_serv.cc                sp1f-net_serv.cc-19700101030959-dp4s27g5nk64sph4g6g54dghekqozzmy
  sql/opt_range.cc               sp1f-opt_range.cc-19700101030959-afe3wtevb7zwrg4xyibt35uamov5r7ds
  sql/opt_subselect.cc           opt_subselect.cc-20100215190428-nekkl8wisp0k6nlk-1
  sql/opt_table_elimination.cc   opt_table_eliminatio-20090625095316-7ka9w3zr7n5114iv-1
  sql/protocol.cc                sp1f-net_pkg.cc-19700101030959-7izj6xxqwgfgxuikg6t24dhcwdedbl6i
  sql/set_var.cc                 sp1f-set_var.cc-20020723153119-nwbpg2pwpz55pfw7yfzaxt7hsszzy7y3
  sql/sp.cc                      sp1f-sp.cc-20021212121421-6xwuvxq5bku2b4yv655kp2e5gsvautd5
  sql/sp_rcontext.cc             sp1f-sp_rcontext.cc-20030916122605-vg62h2qkjnbj54b4zlijgqswudijiyaf
  sql/sql_base.cc                sp1f-sql_base.cc-19700101030959-w7tul2gb2n4jzayjwlslj3ybmf3uhk6a
  sql/sql_class.cc               sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
  sql/sql_insert.cc              sp1f-sql_insert.cc-19700101030959-xgwqe5svnimxudzdcuitauljzz2zjk5g
  sql/sql_load.cc                sp1f-sql_load.cc-19700101030959-hoqlay5we4yslrw23xqedulkejw6a3o5
  sql/sql_parse.cc               sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
  sql/sql_plugin.cc              sp1f-sql_plugin.cc-20051105112032-hrm64p6xfjq33ud6zy3uivpo7azm75a2
  sql/sql_select.cc              sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
  sql/sql_show.cc                sp1f-sql_show.cc-19700101030959-umlljfnpplg452h7reeyqr4xnbmlkvfj
  sql/sql_string.cc              sp1f-sql_string.cc-19700101030959-yg6a37s5vnlpgxanuou6h2vbdmwbdxdx
  sql/sql_string.h               sp1f-sql_string.h-19700101030959-nogsoxwv222e4vm4toic7cabeb4swajz
  sql/sql_table.cc               sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
  sql/sql_test.cc                sp1f-sql_test.cc-19700101030959-7fpt436b3qzk75qpy7rqpho7nkesvwuz
  sql/sql_trigger.cc             sp1f-sql_trigger.cc-20040907122911-35k3wamrp6g7qsupxe7hisftpobcwin5
  sql/sql_trigger.h              sp1f-sql_trigger.h-20040907122912-nptflpgkvpl6vu5piov4wqbo5q6eddpy
  sql/sql_update.cc              sp1f-sql_update.cc-19700101030959-edlgskfuer2ylczbw2znrr5gzfefiyw7
  sql/sql_view.cc                sp1f-sql_view.cc-20040715221517-nw4p4mja6nzzlvwwhzfgfqb4umxqobe4
  sql/sql_yacc.yy                sp1f-sql_yacc.yy-19700101030959-wvn4qyy2drpmge7kaq3dysprbhlrv27j
  sql/table.cc                   sp1f-table.cc-19700101030959-nsxtem2adyqzwe6nz4cgrpcmts3o54v7
  sql/table.h                    sp1f-table.h-19700101030959-dv72bajftxj5fbdjuajquappanuv2ija
  storage/federatedx/ha_federatedx.cc ha_federatedx.cc-20091029224633-m824ql737a2j6q5a-6
  storage/maria/ha_maria.cc      sp1f-ha_maria.cc-20060411134405-dmngb4v5x5fxlxhff527ud3etiutxuxk
  storage/maria/ma_open.c        sp1f-ma_open.c-20060411134425-47m3424sotlyyl5b3k5brotxm23ryffh
  storage/maria/maria_def.h      sp1f-maria_def.h-20060411134454-urdx4joxwcwzxbmltpzejn53y2rgjs44
  storage/myisam/ha_myisam.cc    sp1f-ha_myisam.cc-19700101030959-7xzssylbn7zfz3nupnsw43wws6xlltsu
  storage/myisam/mi_open.c       sp1f-mi_open.c-19700101030959-2q2rxowhivdg4hjkjxyf2wtczsod5d6a
  storage/xtradb/row/row0sel.c   row0sel.c-20081201061010-zymrrwrczns2vrex-339
-------------- next part --------------

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


More information about the commits mailing list