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

[Tor Didriksen]

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

    modified:
      sql/sql_table.cc
      sql/unireg.cc
 3803 Jimmy Yang	2012-03-20 [merge]
      Merge mysql-5.5 to mysql-trunk

    modified:
      storage/innobase/buf/buf0buf.cc
      storage/innobase/include/mtr0mtr.ic
      storage/innobase/include/sync0rw.h
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0purge.cc
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2012-03-19 17:59:14 +0000
+++ b/sql/sql_table.cc	2012-03-20 10:29:55 +0000
@@ -3935,17 +3935,17 @@ bool validate_comment_length(THD *thd, c
   {
     if (thd->is_strict_mode())
     {
-       my_error(err_code, MYF(0),
-       comment_name, static_cast<ulong>(max_len));
-       DBUG_RETURN(true);
+      my_error(err_code, MYF(0),
+               comment_name, static_cast<ulong>(max_len));
+      DBUG_RETURN(true);
     }
     char warn_buff[MYSQL_ERRMSG_SIZE];
     length= my_snprintf(warn_buff, sizeof(warn_buff), ER(err_code),
-                comment_name, static_cast<ulong>(max_len));
+                        comment_name, static_cast<ulong>(max_len));
     /* do not push duplicate warnings */
     if (!thd->get_stmt_da()->has_sql_condition(warn_buff, length)) 
-    push_warning(thd, Sql_condition::WARN_LEVEL_WARN,
-                 err_code, warn_buff);
+      push_warning(thd, Sql_condition::WARN_LEVEL_WARN,
+                   err_code, warn_buff);
     *comment_len= tmp_len;
   }
   DBUG_RETURN(false);

=== modified file 'sql/unireg.cc'
--- a/sql/unireg.cc	2012-03-20 09:33:36 +0000
+++ b/sql/unireg.cc	2012-03-20 10:29:55 +0000
@@ -231,8 +231,10 @@ bool mysql_create_frm(THD *thd, const ch
                                 TABLE_COMMENT_MAXLEN,
                                 ER_TOO_LONG_TABLE_COMMENT,
                                 real_table_name))
-      //my_free(screen_buff);
+    {
+      my_free(screen_buff);
       DBUG_RETURN(true);
+    }
   }
   /*
     If table comment is longer than TABLE_COMMENT_INLINE_MAXLEN bytes,

No bundle (reason: useless for push emails).