bzr push into mysql-5.1-bugteam tree (mleich:2697 to 2698) Bug#20129, Bug#37853

[Matthias Leich]

------------------------------------------------------------
revno: 2698
revision-id: mleich@stripped
parent: mleich@stripped
parent: mattiasj@stripped
committer: Matthias Leich <mleich@stripped>
branch nick: mysql-5.1-bugteam-push
timestamp: Wed 2008-08-13 22:17:43 +0200
message:
  Merge
modified:
  libmysqld/lib_sql.cc          
sp1f-lib_sql.cc-20010411110351-gt5febleap73tqvapkesopvqtuht5sf5
    ------------------------------------------------------------
    revno: 2695.1.1
    revision-id: mattiasj@stripped
    parent: mattiasj@stripped
    committer: Mattias Jonsson <mattiasj@stripped>
    branch nick: topush3-51-bugteam
    timestamp: Wed 2008-08-13 20:50:08 +0200
    message:
      Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that
      partition is corrupt
      
      Post push fix
      
      an DBUG_ASSERT broke the embedded server, fixed by initializing
      it in the embedded version of Protocol_text::prepare_for_resend
    modified:
      libmysqld/lib_sql.cc          
sp1f-lib_sql.cc-20010411110351-gt5febleap73tqvapkesopvqtuht5sf5
------------------------------------------------------------
revno: 2697
revision-id: mleich@stripped
parent: mleich@stripped
committer: Matthias Leich <mleich@stripped>
branch nick: mysql-5.1-bugteam-push
timestamp: Wed 2008-08-13 21:44:54 +0200
message:
  Fix for Bug#37853
      Test "funcs_1.processlist_val_ps" fails in various ways
  + corrections of logic in poll routines
  + minor improvements
modified:
  mysql-test/suite/funcs_1/datadict/processlist_val.inc
sp1f-processlist_val.inc-20070815194641-3hfsmyh3jr2gjhvgms52iydpkamdbnoz
  mysql-test/suite/funcs_1/r/processlist_val_no_prot.result
sp1f-a_processlist_val_no-20070815194641-puz2vi6caqirb4nqzumushorqyuniraq
  mysql-test/suite/funcs_1/r/processlist_val_ps.result
sp1f-b_processlist_val_ps-20070815194641-kl4wj4y6bete5txk6xnyppp2h5atsodw

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