From: Date: August 13 2008 9:36pm
Subject: bzr push into mysql-6.0-bugteam branch (mattiasj:2759 to 2761) Bug#37402,
 Bug#35161
List-Archive: http://lists.mysql.com/commits/51558
X-Bug: 37402
Message-Id: <20080813193641.50228EED7B6@witty.localhost>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2761 Mattias Jonsson	2008-08-13
      Post push fix for bug#35161 and bug#37402
modified:
  mysql-test/lib/mtr_report.pl
  mysql-test/suite/parts/t/disabled.def

 2760 Mattias Jonsson	2008-08-13 [merge]
      merge from mysql-5.1-bugteam
modified:
  libmysqld/lib_sql.cc

 2759 Marc Alff	2008-08-13 [merge]
      Merge 5.1-bugteam -> 6.0-bugteam
      
      This is a NULL merge to resolve bzr conflicts,
      the file contents were already merged separately

=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc	2008-06-20 11:40:01 +0000
+++ b/libmysqld/lib_sql.cc	2008-08-13 19:17:28 +0000
@@ -1103,6 +1103,9 @@ void Protocol_text::prepare_for_resend()
   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;
 }

=== modified file 'mysql-test/lib/mtr_report.pl'
--- a/mysql-test/lib/mtr_report.pl	2008-08-12 16:23:49 +0000
+++ b/mysql-test/lib/mtr_report.pl	2008-08-13 19:33:45 +0000
@@ -441,6 +441,7 @@ sub mtr_report_stats ($) {
                 /Incorrect key file for table '.\/mysqltest\/t_corrupted2.MAI'; try to repair it/ or
                 # Bug#35161, test of auto repair --myisam-recover
                 /able.*_will_crash/ or
+                /Got an error from unknown thread, ha_myisam.cc:/ or
 
                 # lowercase_table3 using case sensitive option on
                 # case insensitive filesystem (InnoDB error).

=== modified file 'mysql-test/suite/parts/t/disabled.def'
--- a/mysql-test/suite/parts/t/disabled.def	2008-08-12 16:23:49 +0000
+++ b/mysql-test/suite/parts/t/disabled.def	2008-08-13 19:33:45 +0000
@@ -12,3 +12,6 @@ ndb_dd_backuprestore           : Bug#326
 partition_mgm_lc0_archive      : Bug#38751 - add partition deletes all rows
 partition_mgm_lc1_archive      : Bug#38751 - add partition deletes all rows
 partition_mgm_lc2_archive      : Bug#38751 - add partition deletes all rows
+partition_mgm_lc0_ndb          : Bug#38778 - master1 crashes
+partition_mgm_lc1_ndb          : Bug#38778 - master1 crashes
+partition_mgm_lc2_ndb          : Bug#38778 - master1 crashes