bzr commit into mysql-5.1-telco-7.0 branch (jonas:4228)

[jonas oreland]

#At file:///home/jonas/src/telco-7.0/ based on revid:jonas@stripped

 4228 jonas oreland	2011-02-23
      ndb - fix ndbinfo

    modified:
      mysql-test/suite/ndb/r/ndbinfo_dump.result
      scripts/mysql_system_tables.sql
      storage/ndb/tools/Makefile.am
=== modified file 'mysql-test/suite/ndb/r/ndbinfo_dump.result'
--- a/mysql-test/suite/ndb/r/ndbinfo_dump.result	2010-08-18 08:02:58 +0000
+++ b/mysql-test/suite/ndb/r/ndbinfo_dump.result	2011-02-23 22:30:50 +0000
@@ -1,7 +1,7 @@
 USE ndbinfo;
 select count(*) from blocks;
 count(*)
-20
+21
 select count(*) from blocks;
 count(*)
-20
+21

=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2010-11-03 09:40:26 +0000
+++ b/scripts/mysql_system_tables.sql	2011-02-23 22:30:50 +0000
@@ -299,7 +299,7 @@ PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;
 
-SET @str=IF(@have_ndbinfo,'INSERT INTO `ndbinfo`.`blocks` VALUES (254, "CMVMI"), (248, "DBACC"), (250, "DBDICT"), (246, "DBDIH"), (247, "DBLQH"), (245, "DBTC"), (249, "DBTUP"), (253, "NDBFS"), (251, "NDBCNTR"), (252, "QMGR"), (255, "TRIX"), (244, "BACKUP"), (256, "DBUTIL"), (257, "SUMA"), (258, "DBTUX"), (259, "TSMAN"), (260, "LGMAN"), (261, "PGMAN"), (262, "RESTORE"), (263, "DBINFO")','SET @dummy = 0');
+SET @str=IF(@have_ndbinfo,'INSERT INTO `ndbinfo`.`blocks` VALUES (254, "CMVMI"), (248, "DBACC"), (250, "DBDICT"), (246, "DBDIH"), (247, "DBLQH"), (245, "DBTC"), (249, "DBTUP"), (253, "NDBFS"), (251, "NDBCNTR"), (252, "QMGR"), (255, "TRIX"), (244, "BACKUP"), (256, "DBUTIL"), (257, "SUMA"), (258, "DBTUX"), (259, "TSMAN"), (260, "LGMAN"), (261, "PGMAN"), (262, "RESTORE"), (263, "DBINFO"), (264, "DBSPJ")','SET @dummy = 0');
 PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;

=== modified file 'storage/ndb/tools/Makefile.am'
--- a/storage/ndb/tools/Makefile.am	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/tools/Makefile.am	2011-02-23 22:30:50 +0000
@@ -75,7 +75,7 @@ ndbinfo_sql_SOURCES = ndbinfo_sql.cpp \
 ndbinfo_sql_CXXFLAGS = -I$(top_srcdir)/storage/ndb/src/mgmapi
 
 # Build ndbinfo.sql by executing ndbinfo_sql
-ndbinfo.sql: $(ndbinfo_sql_SOURCES)
+ndbinfo.sql: $(ndbinfo_sql_SOURCES) ndbinfo_sql$(EXEEXT)
 	$(MAKE) $(AM_MAKEFLAGS) ndbinfo_sql$(EXEEXT)
 	./ndbinfo_sql$(EXEEXT) > $@-t
 	$(MV) $@-t $@


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