bzr push into mysql-6.0 tree (marc.alff:2718 to 2718)

[Marc Alff]

------------------------------------------------------------
revno: 2718
revision-id: marc.alff@stripped
parent: marc.alff@stripped
parent: gshchepa@stripped
committer: Marc Alff <marc.alff@stripped>
branch nick: mysql-6.0-35577-merge
timestamp: Tue 2008-07-15 10:41:12 -0600
message:
  merge bug branch with mysql-6.0-bugteam
modified:
  sql/item_cmpfunc.cc            sp1f-item_cmpfunc.cc-19700101030959-hrk7pi2n6qpwxauufnkizirsoucdcx2e
    ------------------------------------------------------------
    revno: 2716.1.1
    revision-id: gshchepa@stripped
    parent: gshchepa@stripped
    parent: gshchepa@stripped
    committer: Gleb Shchepa <gshchepa@stripped>
    branch nick: mysql-6.0-bugteam
    timestamp: Tue 2008-07-15 17:17:01 +0500
    message:
      merge from local tree into 6.0-bugteam
    modified:
      sql/item_cmpfunc.cc            sp1f-item_cmpfunc.cc-19700101030959-hrk7pi2n6qpwxauufnkizirsoucdcx2e
    ------------------------------------------------------------
    revno: 2497.259.19
    revision-id: gshchepa@stripped
    parent: gshchepa@stripped
    committer: Gleb Shchepa <gshchepa@stripped>
    branch nick: mysql-5.1-bugteam-gca
    timestamp: Tue 2008-07-15 17:12:08 +0500
    message:
      after-push patch: partial rollback of bug #37761 fix.
      
      Note: item->null_value is not updated before a call to
      item->store(), item->is_null() is not too (in common case).
    modified:
      sql/item_cmpfunc.cc            sp1f-item_cmpfunc.cc-19700101030959-hrk7pi2n6qpwxauufnkizirsoucdcx2e

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