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

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.1-ndbinfo/ based on revid:magnus.blaudd@stripped0-so2c9k4wi7watxu1

 2932 Magnus Blåudd	2009-07-03
      ndbinfo
       - make ndb_basic only show variables prefixed with 'ndb_'
       - add test to ndbinfo to show its variables.

    modified:
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndbinfo.result
      mysql-test/suite/ndb/t/ndb_basic.test
      mysql-test/suite/ndb/t/ndbinfo.test
=== modified file 'mysql-test/suite/ndb/r/ndb_basic.result'
--- a/mysql-test/suite/ndb/r/ndb_basic.result	2009-06-04 13:14:14 +0000
+++ b/mysql-test/suite/ndb/r/ndb_basic.result	2009-07-03 11:12:33 +0000
@@ -7,7 +7,7 @@ attr2 INT,
 attr3 VARCHAR(10)
 ) ENGINE=ndbcluster;
 drop table t1;
-SHOW GLOBAL STATUS LIKE 'ndb%';
+SHOW GLOBAL STATUS LIKE 'ndb\_%';
 Variable_name	Value
 Ndb_cluster_node_id	#
 Ndb_config_from_host	#
@@ -21,7 +21,7 @@ Ndb_pruned_scan_count	#
 Ndb_cluster_connection_pool	#
 Ndb_conflict_fn_max	#
 Ndb_conflict_fn_old	#
-SHOW GLOBAL VARIABLES LIKE 'ndb%';
+SHOW GLOBAL VARIABLES LIKE 'ndb\_%';
 Variable_name	Value
 ndb_autoincrement_prefetch_sz	#
 ndb_batch_size	#

=== modified file 'mysql-test/suite/ndb/r/ndbinfo.result'
--- a/mysql-test/suite/ndb/r/ndbinfo.result	2009-07-03 10:31:30 +0000
+++ b/mysql-test/suite/ndb/r/ndbinfo.result	2009-07-03 11:12:33 +0000
@@ -134,5 +134,11 @@ TABLE_ID
 5
 6
 7
+SHOW GLOBAL STATUS LIKE 'ndbinfo\_%';
+Variable_name	Value
+SHOW GLOBAL VARIABLES LIKE 'ndbinfo\_%';
+Variable_name	Value
+ndbinfo_max_bytes	0
+ndbinfo_max_rows	10
 drop table TABLES;
 DROP DATABASE ndb$info;

=== modified file 'mysql-test/suite/ndb/t/ndb_basic.test'
--- a/mysql-test/suite/ndb/t/ndb_basic.test	2008-10-06 11:03:32 +0000
+++ b/mysql-test/suite/ndb/t/ndb_basic.test	2009-07-03 11:12:33 +0000
@@ -25,9 +25,9 @@ drop table t1;
 # Show status and variables
 #
 --replace_column 2 #
-SHOW GLOBAL STATUS LIKE 'ndb%';
+SHOW GLOBAL STATUS LIKE 'ndb\_%';
 --replace_column 2 #
-SHOW GLOBAL VARIABLES LIKE 'ndb%';
+SHOW GLOBAL VARIABLES LIKE 'ndb\_%';
 
 #
 # Create a normal table with primary key

=== modified file 'mysql-test/suite/ndb/t/ndbinfo.test'
--- a/mysql-test/suite/ndb/t/ndbinfo.test	2009-06-24 14:32:19 +0000
+++ b/mysql-test/suite/ndb/t/ndbinfo.test	2009-07-03 11:12:33 +0000
@@ -25,5 +25,9 @@ update TABLES set TABLE_ID=2 where TABLE
 
 FLUSH  TABLES;
 SELECT TABLE_ID from TABLES;
+
+SHOW GLOBAL STATUS LIKE 'ndbinfo\_%';
+SHOW GLOBAL VARIABLES LIKE 'ndbinfo\_%';
+
 drop table TABLES;
 DROP DATABASE ndb$info;

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