bzr push into mysql-6.0 tree (mleich:2812 to 2812)

[Matthias Leich]

------------------------------------------------------------
revno: 2812
revision-id: mleich@stripped
parent: mleich@stripped
parent: mleich@stripped
committer: Matthias Leich <mleich@stripped>
branch nick: mysql-6.0-bugteam-clone
timestamp: Thu 2008-08-28 15:01:54 +0200
message:
  Upmerge 5.1-bugteam -> 6.0-bugteam
  No changes/conflicts because everything
  is already in 6.0-bugteam.
    ------------------------------------------------------------
    revno: 2497.388.8
    revision-id: mleich@stripped
    parent: mleich@stripped
    parent: mleich@stripped
    committer: Matthias Leich <mleich@stripped>
    branch nick: mysql-5.1-bugteam-clone
    timestamp: Thu 2008-08-28 14:35:38 +0200
    message:
      Upmerge 5.0-bugteam - 5.1-bugteam
      No conflicts/changes because 5.1-bugteam
      contains already everything.
    ------------------------------------------------------------
    revno: 1810.3773.2
    revision-id: mleich@stripped
    parent: mleich@stripped
    parent: kgeorge@stripped
    committer: Matthias Leich <mleich@stripped>
    branch nick: mysql-5.0-bugteam-1
    timestamp: Thu 2008-08-28 14:18:40 +0200
    message:
      Merge actual 5.0-bugteam into local tree
    modified:
      include/my_sys.h               sp1f-my_sys.h-19700101030959-lyllvna5vzqfcjnmlcrutgqocylhtb54
      include/myisam.h               sp1f-myisam.h-19700101030959-2zv2wn7kuuvbyktuyfsitra6cl37h3mm
      myisam/mi_check.c              sp1f-mi_check.c-19700101030959-yzbhnjgzcmqdyj4zz5codhkkw5eedp6f
      myisam/mi_create.c             sp1f-mi_create.c-19700101030959-i6lazhpsyf7ggr2yjukf6xxybhraxup3
      myisam/mi_open.c               sp1f-mi_open.c-19700101030959-2q2rxowhivdg4hjkjxyf2wtczsod5d6a
      myisam/mi_static.c             sp1f-mi_static.c-19700101030959-tdmnpz55hlrequ6y4hc3azz6hpxqfv75
      myisam/myisamchk.c             sp1f-myisamchk.c-19700101030959-hdnrqowbdb3ujo3qgjtzs6lgogwckvgc
      myisam/myisamdef.h             sp1f-myisamdef.h-19700101030959-fzrxvpmzhzqfn5w2clasmcw7af4kanoa
      myisam/rt_index.c              sp1f-rt_index.c-20020220101115-g73ue5aednwitjcl3kv42tqfijyn3454
      mysql-test/r/group_min_max.result sp1f-group_min_max.result-20040827133611-aqzadxttbw23mkanmvdsiaambv2pcy27
      mysql-test/r/myisam.result     sp1f-myisam.result-20010411215653-pgxkk2xg4lh3nxresmfnsuszf5h3nont
      mysql-test/r/symlink.result    sp1f-symlink.result-20010605003810-qspjjr4hwq7gpdhzyictx52ddrlmxaco
      mysql-test/r/type_bit.result   sp1f-type_bit.result-20041217140559-ppf6bkjkl3r4tbmlt7ngn46zm6tapa46
      mysql-test/r/udf.result        sp1f-udf.result-20060215161120-pm5l3nyny5gbznc2egfu4bhwgxbuc6wz
      mysql-test/t/group_min_max.test sp1f-group_min_max.test-20040827133612-bbe7hj6l7byvtyxsg4iicylzflsgy6vj
      mysql-test/t/myisam.test       sp1f-myisam.test-20010411215653-cdmhjqbeu3xtipkauwbbirystludnac3
      mysql-test/t/symlink.test      sp1f-symlink.test-20010605003810-7slktyzeszzfljtnmdbque4ow3azjqty
      mysql-test/t/type_bit.test     sp1f-type_bit.test-20041217140559-tzpygypzmjyjiukpq75swmn6zq4ytqe4
      mysys/my_symlink.c             sp1f-my_symlink.c-20010531091851-nnlz7igptpjfrbgf6sspd6vtv2hv63ab
      mysys/thr_lock.c               sp1f-thr_lock.c-19700101030959-igvxgo25qd7i2moc4pgo5eoth3xp34mh
      sql/field.h                    sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
      sql/mysql_priv.h               sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
      sql/mysqld.cc                  sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
      sql/opt_range.cc               sp1f-opt_range.cc-19700101030959-afe3wtevb7zwrg4xyibt35uamov5r7ds
      sql/opt_range.h                sp1f-opt_range.h-19700101030959-c2qbh5kplyvzfgawblxt4md4ubdpxfdy
      sql/set_var.cc                 sp1f-set_var.cc-20020723153119-nwbpg2pwpz55pfw7yfzaxt7hsszzy7y3
      sql/sql_parse.cc               sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
      sql/sql_select.cc              sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
      sql/sql_udf.cc                 sp1f-sql_udf.cc-19700101030959-tk7ysmv4dpwkfhtdovfbqe5i6uvq67ft
      sql/unireg.h                   sp1f-unireg.h-19700101030959-6vhptb2vfyo4mcjkgdm3n5uw6u64czfo

Attachment: [text/text/x-diff] patch-2812.diff