bk commit into 5.1 tree (jonas:1.2795)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-14 18:46:23+01:00, jonas@stripped +1 -0
  fix colliding config param numbers

  storage/ndb/include/mgmapi/mgmapi_config_parameters.h@stripped, 2007-12-14 18:46:20+01:00, jonas@stripped +6 -7
    fix colliding config param numbers

diff -Nrup a/storage/ndb/include/mgmapi/mgmapi_config_parameters.h b/storage/ndb/include/mgmapi/mgmapi_config_parameters.h
--- a/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2007-12-13 11:27:58 +01:00
+++ b/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2007-12-14 18:46:20 +01:00
@@ -123,19 +123,18 @@
 #define CFG_DB_MICRO_GCP_INTERVAL     170 /* micro gcp */
 #define CFG_DB_MICRO_GCP_TIMEOUT      171
 
+#define CFG_DB_COMPRESSED_BACKUP      172
+#define CFG_DB_COMPRESSED_LCP         173
+
 #define CFG_DB_SCHED_EXEC_TIME        174
 #define CFG_DB_SCHED_SPIN_TIME        175
 #define CFG_DB_REALTIME_SCHEDULER     176
 #define CFG_DB_EXECUTE_LOCK_CPU       177
 #define CFG_DB_MAINT_LOCK_CPU         178
 
-#define CFG_DB_COMPRESSED_BACKUP      172
-
-#define CFG_DB_COMPRESSED_LCP         173
-
-#define CFG_DB_SUBSCRIPTIONS          174
-#define CFG_DB_SUBSCRIBERS            175
-#define CFG_DB_SUB_OPERATIONS         176
+#define CFG_DB_SUBSCRIPTIONS          179
+#define CFG_DB_SUBSCRIBERS            180
+#define CFG_DB_SUB_OPERATIONS         181
 
 #define CFG_DB_SGA                    198 /* super pool mem */
 #define CFG_DB_DATA_MEM_2             199 /* used in special build in 5.1 */