bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:4214)

[magnus.blaudd]

#At file:///data0/magnus/mysql/7.1/ based on revid:magnus.blaudd@stripped

 4214 magnus.blaudd@stripped	2011-05-23
      ndbinfo
       - use the new ndbinfo_offline mode in the mysql_system_table.sql script
       (which is used by mysql_upgrade)

    modified:
      scripts/mysql_system_tables.sql
=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2011-04-12 15:01:48 +0000
+++ b/scripts/mysql_system_tables.sql	2011-05-23 15:29:50 +0000
@@ -135,6 +135,14 @@ PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;
 
+# Set NDBINFO in offline mode during (re)create of tables
+# and views to avoid errors caused by no such table or
+# different table definition in NDB
+SET @str=IF(@have_ndbinfo,'SET @@global.ndbinfo_offline=TRUE','SET @dummy = 0');
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;
+
 # Drop any old views in ndbinfo
 SET @str=IF(@have_ndbinfo,'DROP VIEW IF EXISTS ndbinfo.transporters','SET @dummy = 0');
 PREPARE stmt FROM @str;
@@ -377,3 +385,9 @@ SET @str=IF(@have_ndbinfo,'CREATE OR REP
 PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;
+
+# Finally turn off offline mode
+SET @str=IF(@have_ndbinfo,'SET @@global.ndbinfo_offline=FALSE','SET @dummy = 0');
+PREPARE stmt FROM @str;
+EXECUTE stmt;
+DROP PREPARE stmt;


Attachment: [text/bzr-bundle] bzr/[e-mail]