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

[Magnus Blåudd]

#At file:///data0/magnus/mysql/7.0/ based on revid:magnus.blaudd@stripped

 3997 Magnus Blåudd	2010-11-11
      ndb
       - remove unused define NO_DEBUG_MESSAGES

    modified:
      storage/ndb/include/ndb_global.h
      storage/ndb/src/mgmapi/Makefile.am
      storage/ndb/src/mgmsrv/Makefile.am
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
=== modified file 'storage/ndb/include/ndb_global.h'
--- a/storage/ndb/include/ndb_global.h	2010-10-28 07:45:21 +0000
+++ b/storage/ndb/include/ndb_global.h	2010-11-11 10:55:38 +0000
@@ -46,7 +46,6 @@
 #define NDB_WIN 1
 #define PATH_MAX 256
 #define DIR_SEPARATOR "\\"
-#define MYSQLCLUSTERDIR "c:\\mysql\\mysql-cluster"
 #define HAVE_STRCASECMP
 #pragma warning(disable: 4503 4786)
 #else

=== modified file 'storage/ndb/src/mgmapi/Makefile.am'
--- a/storage/ndb/src/mgmapi/Makefile.am	2010-08-06 08:19:19 +0000
+++ b/storage/ndb/src/mgmapi/Makefile.am	2010-11-11 10:55:38 +0000
@@ -25,8 +25,7 @@ libmgmapi_la_SOURCES = mgmapi.cpp ndb_lo
 
 INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/mgmapi
 
-DEFS_LOC = -DNDB_MGMAPI -DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\"" \
-           -DNO_DEBUG_MESSAGES
+DEFS_LOC = -DNDB_MGMAPI -DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\""
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_util.mk.am

=== modified file 'storage/ndb/src/mgmsrv/Makefile.am'
--- a/storage/ndb/src/mgmsrv/Makefile.am	2010-08-06 08:19:19 +0000
+++ b/storage/ndb/src/mgmsrv/Makefile.am	2010-11-11 10:55:38 +0000
@@ -16,11 +16,6 @@
 
 EXTRA_DIST = CMakeLists.txt
 
-MYSQLDATAdir =		$(localstatedir)
-MYSQLSHAREdir =		$(pkgdatadir)
-MYSQLBASEdir=		$(prefix)
-MYSQLCLUSTERdir=        $(prefix)/mysql-cluster
-
 ndbbin_PROGRAMS = ndb_mgmd
 
 ndb_mgmd_SOURCES = \
@@ -55,10 +50,7 @@ LDADD_LOC = $(top_builddir)/storage/ndb/
             @NDB_SCI_LIBS@ \
 	    @TERMCAP_LIB@
 
-DEFS_LOC =		-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
-			-DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
-			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
-			-DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\""
+#DEFS_LOC = -DMYSQLCLUSTERDIR="\"$(prefix)/mysql-cluster\""
 
 include $(top_srcdir)/storage/ndb/config/common.mk.am
 include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am

=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2010-10-15 08:57:02 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2010-11-11 10:55:38 +0000
@@ -276,6 +276,10 @@ MgmtSrvr::MgmtSrvr(const MgmtOpts& opts)
 }
 
 
+#ifndef MYSQLCLUSTERDIR
+#error "Required define MYSQLCLUSTERDIR is missing"
+#endif
+
 /*
   check_configdir
 

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