From: Date: August 13 2008 10:17pm
Subject: bzr commit into mysql-5.1-bugteam tree (mleich:2698) Bug#20129
List-Archive: http://lists.mysql.com/commits/51570
X-Bug: 20129
Message-Id: <20080813201757.59CE4A528F@five.local.lan>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1751482031880526268=="

--===============1751482031880526268==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

------------------------------------------------------------
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: Mi 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: Mi 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

--===============1751482031880526268==
MIME-Version: 1.0
Content-Type: text/text/x-diff; charset="us-ascii"; name="patch-2698.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc	2008-06-18 16:17:15 +0000
+++ b/libmysqld/lib_sql.cc	2008-08-13 18:50:08 +0000
@@ -1103,6 +1103,9 @@
   data->embedded_info->prev_ptr= &cur->next;
   next_field=cur->data;
   next_mysql_field= data->embedded_info->fields_list;
+#ifndef DBUG_OFF
+  field_pos= 0;
+#endif
 
   DBUG_VOID_RETURN;
 }


--===============1751482031880526268==--