bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3206)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@strippedfr3ntodls2

 3206 Magnus Blåudd	2009-11-08
      ndbinfo
       - Change the comments in the sql file generated by ndbinfo_sql to #
        so that it can be sourced by mysqltest script

    modified:
      mysql-test/suite/ndb/t/ndbinfo.test
      storage/ndb/tools/ndbinfo_sql.cpp
=== modified file 'mysql-test/suite/ndb/t/ndbinfo.test'
--- a/mysql-test/suite/ndb/t/ndbinfo.test	2009-11-08 12:52:27 +0000
+++ b/mysql-test/suite/ndb/t/ndbinfo.test	2009-11-08 21:16:50 +0000
@@ -11,7 +11,11 @@ CREATE TEMPORARY TABLE `t1` (
 ) ENGINE=NDBINFO;
 
 # Run the ndbinfo.sql script that creates ndbinfo database, tables and views
---exec $MYSQL < $NDBINFO_SQL 2>&1
+--disable_warnings
+--disable_query_log
+source $NDBINFO_SQL;
+--enable_query_log
+--enable_warnings
 
 USE ndbinfo;
 

=== modified file 'storage/ndb/tools/ndbinfo_sql.cpp'
--- a/storage/ndb/tools/ndbinfo_sql.cpp	2009-11-08 14:17:04 +0000
+++ b/storage/ndb/tools/ndbinfo_sql.cpp	2009-11-08 21:16:50 +0000
@@ -123,20 +123,20 @@ int main(int argc, char** argv){
   if ((handle_options(&argc, &argv, my_long_options, NULL)))
     return 2;
 
-  printf("--\n");
-  printf("-- SQL commands for creating the tables in MySQL Server which \n");
-  printf("-- are used by the NDBINFO storage engine to access system \n");
-  printf("-- information and statistics from MySQL Cluster\n");
-  printf("--\n");
+  printf("#\n");
+  printf("# SQL commands for creating the tables in MySQL Server which \n");
+  printf("# are used by the NDBINFO storage engine to access system \n");
+  printf("# information and statistics from MySQL Cluster\n");
+  printf("#\n");
 
   printf("CREATE DATABASE IF NOT EXISTS `%s`;\n\n", opt_ndbinfo_db);
 
-  printf("-- Only create tables if NDBINFO is enabled\n");
+  printf("# Only create tables if NDBINFO is enabled\n");
   printf("SELECT @have_ndbinfo:= COUNT(*) FROM "
                   "information_schema.engines WHERE engine='NDBINFO' "
                   "AND support IN ('YES', 'DEFAULT');\n\n");
 
-  printf("-- drop any old views in %s\n", opt_ndbinfo_db);
+  printf("# drop any old views in %s\n", opt_ndbinfo_db);
   for (size_t i = 0; i < num_views; i++)
   {
     printf("DROP VIEW IF EXISTS %s.%s;\n",
@@ -148,7 +148,7 @@ int main(int argc, char** argv){
   {
     const Ndbinfo::Table& table = Ndbinfo::getTable(i);
 
-    printf("-- %s.%s%s\n",
+    printf("# %s.%s%s\n",
             opt_ndbinfo_db, opt_table_prefix, table.m.name);
 
     /* Drop the table if it exists */
@@ -206,15 +206,15 @@ int main(int argc, char** argv){
 
   }
 
-  printf("--\n");
-  printf("-- %s views\n", opt_ndbinfo_db);
-  printf("--\n\n");
+  printf("#\n");
+  printf("# %s views\n", opt_ndbinfo_db);
+  printf("#\n\n");
 
   for (size_t i = 0; i < num_views; i++)
   {
     view v = views[i];
 
-    printf("-- %s.%s\n", opt_ndbinfo_db, v.name);
+    printf("# %s.%s\n", opt_ndbinfo_db, v.name);
 
     BaseString view_sql = replace_tags(v.sql);
 

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