MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Martin Zaun Date:October 8 2009 4:46pm
Subject:bzr commit into mysql-5.1-telco-6.3 branch (martin.zaun:3093) Bug#47897
View as plain text  
#At file:///Users/mz/mysql/ndb-6.3-work/ based on revid:magnus.blaudd@stripped

 3093 Martin Zaun	2009-10-08
      ndb - bug#47897 - minor clean up actions in include/mgmapi.

    removed:
      storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h
    renamed:
      storage/ndb/include/mgmapi/mgmapi_debug.h => storage/ndb/src/mgmapi/mgmapi_debug.h
    modified:
      storage/ndb/include/Makefile.am
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h
      storage/ndb/include/mgmapi/ndb_logevent.h
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
      storage/ndb/src/kernel/Makefile.am
      storage/ndb/src/kernel/vm/Configuration.cpp
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp
      storage/ndb/src/mgmclient/Makefile.am
=== modified file 'storage/ndb/include/Makefile.am'
--- a/storage/ndb/include/Makefile.am	2009-05-26 18:53:34 +0000
+++ b/storage/ndb/include/Makefile.am	2009-10-08 16:46:39 +0000
@@ -48,9 +48,7 @@ ndbapi/NdbInterpretedCode.hpp
 mgmapiinclude_HEADERS = \
 mgmapi/mgmapi.h \
 mgmapi/mgmapi_error.h \
-mgmapi/mgmapi_debug.h \
 mgmapi/mgmapi_config_parameters.h \
-mgmapi/mgmapi_config_parameters_debug.h \
 mgmapi/ndb_logevent.h \
 mgmapi/ndbd_exit_codes.h
 

=== modified file 'storage/ndb/include/mgmapi/mgmapi_config_parameters.h'
--- a/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2009-07-02 20:47:17 +0000
+++ b/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2009-10-08 16:46:39 +0000
@@ -111,9 +111,6 @@
 #define CFG_DB_STRING_MEMORY          161 /* used from 5.1 */
 #define CFG_DB_INITIAL_OPEN_FILES     162 /* used from 5.1 */
 
-#define CFG_DB_DISK_PAGE_BUFFER_MEMORY 160
-#define CFG_DB_STRING_MEMORY          161
-
 #define CFG_DB_DISK_SYNCH_SIZE        163
 #define CFG_DB_CHECKPOINT_SPEED       164
 #define CFG_DB_CHECKPOINT_SPEED_SR    165
@@ -227,6 +224,8 @@
 /**
  * Internal
  */
+#ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
+
 #define CFG_DB_STOP_ON_ERROR_INSERT   1
 
 #define CFG_TYPE_OF_SECTION           999                 
@@ -243,4 +242,6 @@
 #define CONNECTION_TYPE_SCI           2
 #define CONNECTION_TYPE_OSE           3 /* Removed. */
 
+#endif /* DOXYGEN_SHOULD_SKIP_INTERNAL */
+
 #endif

=== removed file 'storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h'
--- a/storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h	2009-05-26 18:53:34 +0000
+++ b/storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-/*
-   Copyright (C) 2004 MySQL AB
-    All rights reserved. Use is subject to license terms.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 of the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
-*/
-
-#ifndef MGMAPI_CONFIG_PARAMTERS_DEBUG_H
-#define MGMAPI_CONFIG_PARAMTERS_DEBUG_H
-
-#include "mgmapi_config_parameters.h"
-
-#define CFG_DB_STOP_ON_ERROR_INSERT   1
-
-#endif

=== modified file 'storage/ndb/include/mgmapi/ndb_logevent.h'
--- a/storage/ndb/include/mgmapi/ndb_logevent.h	2009-10-01 05:56:05 +0000
+++ b/storage/ndb/include/mgmapi/ndb_logevent.h	2009-10-08 16:46:39 +0000
@@ -495,13 +495,17 @@ extern "C" {
   };
   struct ndb_logevent_MemoryUsage {
     int      gth;
+#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED 
     /* union is for compatibility backward.
      * page_size_kb member variable should be removed in the future
      */
     union {
       unsigned page_size_kb;
+#endif
       unsigned page_size_bytes;
+#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED 
     };
+#endif
     unsigned pages_used;
     unsigned pages_total;
     unsigned block;

=== modified file 'storage/ndb/src/common/transporter/TransporterRegistry.cpp'
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2009-09-08 12:23:44 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2009-10-08 16:46:39 +0000
@@ -47,7 +47,7 @@ extern int g_ndb_shm_signum;
 
 #include <mgmapi/mgmapi.h>
 #include <mgmapi_internal.h>
-#include <mgmapi/mgmapi_debug.h>
+#include <mgmapi_debug.h>
 
 #include <EventLogger.hpp>
 extern EventLogger * g_eventLogger;

=== modified file 'storage/ndb/src/kernel/Makefile.am'
--- a/storage/ndb/src/kernel/Makefile.am	2009-09-24 18:56:22 +0000
+++ b/storage/ndb/src/kernel/Makefile.am	2009-10-08 16:46:39 +0000
@@ -25,6 +25,7 @@ ndbd_SOURCES = main.cpp SimBlockList.cpp
 include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
 
 INCLUDES += \
+	-I$(top_srcdir)/storage/ndb/src/mgmapi \
 	-I$(srcdir)/blocks/cmvmi \
 	-I$(srcdir)/blocks/dbacc \
 	-I$(srcdir)/blocks/dbdict \

=== modified file 'storage/ndb/src/kernel/vm/Configuration.cpp'
--- a/storage/ndb/src/kernel/vm/Configuration.cpp	2009-05-27 12:11:46 +0000
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp	2009-10-08 16:46:39 +0000
@@ -31,7 +31,6 @@
 #include <WatchDog.hpp>
 
 #include <mgmapi_configuration.hpp>
-#include <mgmapi_config_parameters_debug.h>
 #include <kernel_config_parameters.h>
 
 #include <kernel_types.h>

=== modified file 'storage/ndb/src/kernel/vm/SimulatedBlock.hpp'
--- a/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2009-09-25 11:17:18 +0000
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2009-10-08 16:46:39 +0000
@@ -50,7 +50,6 @@
 
 #include <mgmapi.h>
 #include <mgmapi_config_parameters.h>
-#include <mgmapi_config_parameters_debug.h>
 #include <kernel_config_parameters.h>
 #include <Configuration.hpp>
 

=== renamed file 'storage/ndb/include/mgmapi/mgmapi_debug.h' => 'storage/ndb/src/mgmapi/mgmapi_debug.h'
=== modified file 'storage/ndb/src/mgmclient/Makefile.am'
--- a/storage/ndb/src/mgmclient/Makefile.am	2009-05-26 18:53:34 +0000
+++ b/storage/ndb/src/mgmclient/Makefile.am	2009-10-08 16:46:39 +0000
@@ -32,6 +32,7 @@ include $(top_srcdir)/storage/ndb/config
 include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
 
 INCLUDES += -I$(top_srcdir)/storage/ndb/include/mgmapi \
+            -I$(top_srcdir)/storage/ndb/src/mgmapi \
             -I$(top_srcdir)/storage/ndb/src/common/mgmcommon
 
 LDADD_LOC = $(noinst_LTLIBRARIES) \


Attachment: [text/bzr-bundle] bzr/martin.zaun@sun.com-20091008164639-plsbrgig90c8kc0j.bundle
Thread
bzr commit into mysql-5.1-telco-6.3 branch (martin.zaun:3093) Bug#47897Martin Zaun8 Oct