bzr commit into mysql-5.1-telco-7.0 branch (jack:2862) Bug#31754

[jack andrews]

#At file:///C:/w/repo/70/ based on revid:jack@stripped

 2862 jack andrews	2009-03-31
      bug#31754 ndb_mgm -e 'start backup wait started' does not display output on stdout

    added:
      mysql-test/suite/ndb/r/ndb_bug31754.result
      mysql-test/suite/ndb/t/ndb_bug31754.test
    modified:
      storage/ndb/src/mgmclient/CommandInterpreter.cpp
=== added file 'mysql-test/suite/ndb/r/ndb_bug31754.result'
--- a/mysql-test/suite/ndb/r/ndb_bug31754.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/r/ndb_bug31754.result	2009-03-31 09:04:22 +0000
@@ -0,0 +1,7 @@
+Connected to Management Server at: localhost:x
+Waiting for started, this may take several minutes
+Node x: Backup x started from node x
+Node x: Backup x started from node x completed
+ StartGCP: x StopGCP: x
+ #Records: x #LogRecords: x
+ Data: x bytes Log: x bytes

=== added file 'mysql-test/suite/ndb/t/ndb_bug31754.test'
--- a/mysql-test/suite/ndb/t/ndb_bug31754.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb/t/ndb_bug31754.test	2009-03-31 09:04:22 +0000
@@ -0,0 +1,6 @@
+-- source include/have_ndb.inc
+-- source include/ndb_default_cluster.inc
+
+-- replace_regex /[0-9]+/x/
+-- exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "start backup wait started"
+

=== modified file 'storage/ndb/src/mgmclient/CommandInterpreter.cpp'
--- a/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2009-03-14 20:42:04 +0000
+++ b/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2009-03-31 09:04:22 +0000
@@ -3055,7 +3055,7 @@ CommandInterpreter::executeStartBackup(c
 
   NdbLogEventHandle log_handle= NULL;
   struct ndb_logevent log_event;
-  if (flags == 2 && !interactive)
+  if (flags > 0 && !interactive)
   {
     int filter[] = { 15, NDB_MGM_EVENT_CATEGORY_BACKUP, 0, 0 };
     log_handle = ndb_mgm_create_logevent_handle(m_mgmsrv, filter);


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