bzr push into mysql-trunk-wl5534-stage branch (jon.hauglid:3855 to 3856) WL#5534

[Jon Olav Hauglid]

 3856 Jon Olav Hauglid	2012-03-08
      WL#5534 Online ALTER, Phase 1
      
      Fix compilation errors after last merge.

    modified:
      sql/ha_ndbcluster.cc
      sql/sql_table.cc
 3855 Marko Mäkelä	2012-03-08 [merge]
      Merge mysql-trunk to mysql-trunk-wl5534-stage.

    modified:
      storage/innobase/btr/btr0pcur.cc
      vio/viosslfactories.c
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2012-03-06 17:10:16 +0000
+++ b/sql/ha_ndbcluster.cc	2012-03-08 15:58:08 +0000
@@ -368,7 +368,7 @@ ndbcluster_alter_table_flags(uint flags)
     HA_PARTITION_FUNCTION_SUPPORTED |
     0;
 
-  if (flags & ALTER_DROP_PARTITION)
+  if (flags & Alter_info::ALTER_DROP_PARTITION)
     return 0;
 
   return f;

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2012-03-08 14:22:07 +0000
+++ b/sql/sql_table.cc	2012-03-08 15:58:08 +0000
@@ -7438,7 +7438,7 @@ end_inplace:
 
   ha_binlog_log_query(thd, create_info->db_type, LOGCOM_ALTER_TABLE,
                       thd->query(), thd->query_length(),
-                      db, table_name);
+                      alter_ctx.db, alter_ctx.table_name);
 
   DBUG_ASSERT(!(mysql_bin_log.is_open() &&
                 thd->is_current_stmt_binlog_format_row() &&

No bundle (reason: useless for push emails).