bzr push into mysql-5.5-telco-7.0 branch (magnus.blaudd:3213 to 3214)

[Magnus Blåudd]

 3214 Magnus Blåudd	2011-02-16
      ndb
       - fix typo in mysql_system_tables_fix.sql, need TABLE in the ALTER
       - add better comments

    modified:
      scripts/mysql_system_tables_fix.sql
 3213 Magnus Blåudd	2011-02-16 [merge]
      Merge

    modified:
      mysql-test/suite/ndb/r/ndb_alter_table.result
      mysql-test/suite/ndb/r/ndb_blob.result
      mysql-test/suite/ndb/r/ndb_gis.result
      mysql-test/suite/ndb/r/ndb_restore.result
      mysql-test/suite/ndb/r/ndbinfo.result
      mysql-test/suite/ndb/t/ndbinfo.test
      sql/ha_ndbinfo.cc
=== modified file 'scripts/mysql_system_tables_fix.sql'
--- a/scripts/mysql_system_tables_fix.sql	2011-02-15 10:28:28 +0000
+++ b/scripts/mysql_system_tables_fix.sql	2011-02-16 11:08:39 +0000
@@ -648,14 +648,19 @@ CREATE TABLE IF NOT EXISTS proxy_priv (H
 #
 # mysql.ndb_binlog_index
 #
-ALTER ndb_binlog_index
+# Change type from BIGINT to INT
+ALTER TABLE ndb_binlog_index
   MODIFY inserts INT UNSIGNED NOT NULL,
   MODIFY updates INT UNSIGNED NOT NULL,
   MODIFY deletes INT UNSIGNED NOT NULL,
-  MODIFY schemaops INT UNSIGNED NOT NULL,
+  MODIFY schemaops INT UNSIGNED NOT NULL;
+# Add new columns
+ALTER TABLE ndb_binlog_index
   ADD orig_server_id INT UNSIGNED NOT NULL,
   ADD orig_epoch BIGINT UNSIGNED NOT NULL,
-  ADD gci INT UNSIGNED NOT NULL,
+  ADD gci INT UNSIGNED NOT NULL;
+# New primary key
+ALTER TABLE ndb_binlog_index
   DROP PRIMARY KEY,
   ADD PRIMARY KEY(epoch, orig_server_id, orig_epoch);
 

No bundle (reason: useless for push emails).