bzr push into mysql-trunk branch (manish.4.kumar:3857 to 3858)

[Manish Kumar]

 3858 Manish Kumar	2012-04-10 [merge]
      upmerge from mysql-5.5 -> mysql-trunk

    modified:
      sql/mysqld.cc
 3857 Jon Olav Hauglid	2012-04-10
      WL#6255 Online ALTER TABLE…MODIFY…NOT NULL, ADD FOREIGN KEY
      
      Pre-requisite patch.
      
      This patch splits the Alter_inplace_info handler flag
      ALTER_COLUMN_NULLABLE in two - ALTER_COLUMN_NULLABLE
      for changing a NOT NULL column to NULL, and
      ALTER_COLUMN_NOT_NULLABLE for changing a NULL column
      to NOT NULL. This is done to make it easier for storage
      engines as these two operations have different requirements.

    modified:
      mysql-test/r/alter_table.result
      mysql-test/t/alter_table.test
      sql/handler.h
      sql/sql_table.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-04-04 06:57:23 +0000
+++ b/sql/mysqld.cc	2012-04-10 11:25:38 +0000
@@ -1992,7 +1992,12 @@ static void network_init(void)
   {
     report_port= mysqld_port;
   }
-  DBUG_ASSERT(report_port != 0);
+
+#ifndef DBUG_OFF
+  if (!opt_disable_networking)
+    DBUG_ASSERT(report_port != 0);
+#endif
+
   if (mysqld_port != 0 && !opt_disable_networking && !opt_bootstrap)
   {
     struct addrinfo *ai, *a;

No bundle (reason: useless for push emails).