bzr commit into mysql-5.1 branch (tomas.ulin:2691)

[Tomas Ulin]

#At file:///home/tomas/mysql_src/cge-6.2-global-schema-lock/

 2691 Tomas Ulin	2008-10-09 [merge]
      merge
modified:
  storage/ndb/test/run-test/setup.cpp

=== modified file 'storage/ndb/test/run-test/setup.cpp'
--- a/storage/ndb/test/run-test/setup.cpp	2008-09-25 10:21:14 +0000
+++ b/storage/ndb/test/run-test/setup.cpp	2008-10-08 21:05:55 +0000
@@ -34,12 +34,10 @@ struct proc_option f_options[] = {
   ,{ "--host=",        atrt_process::AP_CLIENT, 0 }
   ,{ "--server-id=",   atrt_process::AP_MYSQLD, PO_REP }
   ,{ "--log-bin",      atrt_process::AP_MYSQLD, PO_REP_MASTER }
-#if 0
   ,{ "--master-host=", atrt_process::AP_MYSQLD, PO_REP_SLAVE }
   ,{ "--master-port=", atrt_process::AP_MYSQLD, PO_REP_SLAVE }
   ,{ "--master-user=", atrt_process::AP_MYSQLD, PO_REP_SLAVE }
   ,{ "--master-password=", atrt_process::AP_MYSQLD, PO_REP_SLAVE }
-#endif
   ,{ "--ndb-connectstring=", atrt_process::AP_MYSQLD | atrt_process::AP_CLUSTER
      ,PO_NDB }
   ,{ "--ndbcluster", atrt_process::AP_MYSQLD, PO_NDB }