bzr commit into mysql-5.1 tree (Matthias.Leich:2743)

[Matthias Leich]

#At file:///work2/5.1/mysql-5.1-bugteam-push/

------------------------------------------------------------
revno: 2743
revision-id: matthias.leich@stripped
parent: matthias.leich@stripped
parent: matthias.leich@stripped
committer: Matthias Leich <Matthias.Leich@stripped>
branch nick: mysql-5.1-bugteam-push
timestamp: Do 2008-09-18 15:46:27 +0200
message:
  Merge 5.0 -> 5.1
  no conflicts, no real code changes
    ------------------------------------------------------------
    revno: 1810.3765.11
    revision-id: matthias.leich@stripped
    parent: matthias.leich@stripped
    parent: azundris@stripped
    committer: Matthias Leich <Matthias.Leich@stripped>
    branch nick: mysql-5.0-bugteam-push
    timestamp: Do 2008-09-18 15:32:06 +0200
    message:
      Merge actual tree -> local tree
      no conflicts
    modified:
      mysql-test/r/loaddata.result   sp1f-loaddata.result-20030505115238-y53yqooyomv7c43r2heznierboaww576
      mysql-test/t/loaddata.test     sp1f-loaddata.test-20030505115238-2kz3yrlkdadbbcxdc3cncvt7ofzo2ln5
      sql/sql_class.cc               sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
      sql/sql_class.h                sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
      sql/sql_load.cc                sp1f-sql_load.cc-19700101030959-hoqlay5we4yslrw23xqedulkejw6a3o5

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