bzr push into mysql-trunk branch (tor.didriksen:3802 to 3803) Bug#11748924

[Tor Didriksen]

 3803 Tor Didriksen	2012-03-20
      BUG#11748924 PARTITIONS: TOO-LONG COMMENT CAUSES NO WARNING
      
      Post-push fix: remove memory leak.

    modified:
      sql/unireg.cc
 3802 Tor Didriksen	2012-03-20
      Remove another ~1000 warnings on 64bit windows

    modified:
      sql/filesort_utils.h
      sql/sql_class.h
      sql/sql_error.h
=== modified file 'sql/unireg.cc'
--- a/sql/unireg.cc	2012-03-19 17:59:14 +0000
+++ b/sql/unireg.cc	2012-03-20 08:15:15 +0000
@@ -122,7 +122,7 @@ bool mysql_create_frm(THD *thd, const ch
   File file;
   ulong filepos, data_offset;
   uchar fileinfo[64],forminfo[288],*keybuff, *forminfo_p= forminfo;
-  uchar *screen_buff;
+  uchar *screen_buff= NULL;
   char buff[128];
 #ifdef WITH_PARTITION_STORAGE_ENGINE
   partition_info *part_info= thd->work_part_info;
@@ -231,6 +231,7 @@ bool mysql_create_frm(THD *thd, const ch
                                 TABLE_COMMENT_MAXLEN,
                                 ER_TOO_LONG_TABLE_COMMENT,
                                 real_table_name))
+      my_free(screen_buff);
       DBUG_RETURN(true);
   }
   /*

No bundle (reason: useless for push emails).