From: Marc Alff
Date: September 20 2010 9:00pm
Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3270)
List-Archive: http://lists.mysql.com/commits/118641
Message-Id: <20100920210016.3F48845E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6689715105890084332=="

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

#At file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-merge/ based on revid:marc.alff@stripped

 3270 Marc Alff	2010-09-20 [merge]
      Merge mysql-5.5-bugfixing --> mysql-trunk-bugfixing

    modified:
      storage/perfschema/pfs_engine_table.cc
=== modified file 'storage/perfschema/pfs_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc	2010-08-12 15:25:01 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2010-09-20 20:59:48 +0000
@@ -223,6 +223,8 @@ int PFS_engine_table::read_row(TABLE *ta
                                Field **fields)
 {
   my_bitmap_map *org_bitmap;
+  Field *f;
+  Field **fields_reset;
 
   /*
     Make sure the table structure is as expected before mapping
@@ -240,6 +242,16 @@ int PFS_engine_table::read_row(TABLE *ta
 
   /* We internally write to Fields to support the read interface */
   org_bitmap= dbug_tmp_use_all_columns(table, table->write_set);
+
+  /*
+    Some callers of the storage engine interface do not honor the
+    f->is_null() flag, and will attempt to read the data itself.
+    A known offender is mysql_checksum_table().
+    For robustness, reset every field.
+  */
+  for (fields_reset= fields; (f= *fields_reset) ; fields_reset++)
+    f->reset();
+
   int result= read_row_values(table, buf, fields, read_all);
   dbug_tmp_restore_column_map(table->write_set, org_bitmap);
 


--===============6689715105890084332==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   merge/
# testament_sha1: f07fe5127b05067c4559226db108fe000e3b2367
# timestamp: 2010-09-20 15:00:16 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/
# base_revision_id: marc.alff@stripped\
#   9zyl80cvleo85tg1
# 
# Begin bundle
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


--===============6689715105890084332==--