summaryrefslogtreecommitdiff
path: root/ndb/include
diff options
context:
space:
mode:
authorjonas@perch.ndb.mysql.com <>2006-05-08 07:48:08 +0200
committerjonas@perch.ndb.mysql.com <>2006-05-08 07:48:08 +0200
commita5fc03387a876e36913221c6e767c0730520d4bd (patch)
tree30d69083afe58e49433744a0413464342b8d9710 /ndb/include
parent0928ae9bf4071775f5e8d5606ec380058d732637 (diff)
parentee9723fecb5f0a78d7d071972c908285950f850f (diff)
downloadmariadb-git-a5fc03387a876e36913221c6e767c0730520d4bd.tar.gz
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
Diffstat (limited to 'ndb/include')
-rw-r--r--ndb/include/mgmapi/mgmapi_config_parameters.h1
-rw-r--r--ndb/include/util/SocketServer.hpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/ndb/include/mgmapi/mgmapi_config_parameters.h b/ndb/include/mgmapi/mgmapi_config_parameters.h
index 9076f18c5ac..ec69be74d12 100644
--- a/ndb/include/mgmapi/mgmapi_config_parameters.h
+++ b/ndb/include/mgmapi/mgmapi_config_parameters.h
@@ -65,6 +65,7 @@
#define CFG_DB_BACKUP_DATA_BUFFER_MEM 134
#define CFG_DB_BACKUP_LOG_BUFFER_MEM 135
#define CFG_DB_BACKUP_WRITE_SIZE 136
+#define CFG_DB_BACKUP_MAX_WRITE_SIZE 139
#define CFG_LOG_DESTINATION 147
diff --git a/ndb/include/util/SocketServer.hpp b/ndb/include/util/SocketServer.hpp
index ee2dd31c41f..02a0a6b5d92 100644
--- a/ndb/include/util/SocketServer.hpp
+++ b/ndb/include/util/SocketServer.hpp
@@ -74,7 +74,7 @@ public:
/**
* Constructor / Destructor
*/
- SocketServer(int maxSessions = 32);
+ SocketServer(unsigned maxSessions = ~(unsigned)0);
~SocketServer();
/**