Merge perch.ndb.mysql.com:/home/jonas/src/51-work

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

storage/ndb/include/mgmapi/mgmapi_config_parameters.h

@@ -64,6 +64,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
 

storage/ndb/include/util/SocketServer.hpp

@@ -75,7 +75,7 @@ public:
   /**
    * Constructor / Destructor
    */
-  SocketServer(int maxSessions = 32);
+  SocketServer(unsigned maxSessions = ~(unsigned)0);
   ~SocketServer();
   
   /**

storage/ndb/src/common/util/SocketServer.cpp

@@ -27,7 +27,7 @@
 
 #define DEBUG(x) ndbout << x << endl;
 
-SocketServer::SocketServer(int maxSessions) :
+SocketServer::SocketServer(unsigned maxSessions) :
   m_sessions(10),
   m_services(5)
 {
@@ -136,7 +136,7 @@ SocketServer::setup(SocketServer::Service * service,
   }
 
   DBUG_PRINT("info",("bound to %u",ntohs(servaddr.sin_port)));
-  if (listen(sock, m_maxSessions) == -1){
+  if (listen(sock, m_maxSessions > 32 ? 32 : m_maxSessions) == -1){
     DBUG_PRINT("error",("listen() - %d - %s",
 			errno, strerror(errno)));
     NDB_CLOSE_SOCKET(sock);

storage/ndb/src/kernel/blocks/backup/BackupInit.cpp

@@ -163,15 +163,16 @@ Backup::execREAD_CONFIG_REQ(Signal* signal)
   
   Uint32 szDataBuf = (2 * 1024 * 1024);
   Uint32 szLogBuf = (2 * 1024 * 1024);
-  Uint32 szWrite = 32768;
+  Uint32 szWrite = 32768, maxWriteSize = (256 * 1024);
   ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_DATA_BUFFER_MEM, &szDataBuf);
   ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_LOG_BUFFER_MEM, &szLogBuf);
   ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_WRITE_SIZE, &szWrite);
+  ndb_mgm_get_int_parameter(p, CFG_DB_BACKUP_MAX_WRITE_SIZE, &maxWriteSize);
   
   c_defaults.m_logBufferSize = szLogBuf;
   c_defaults.m_dataBufferSize = szDataBuf;
   c_defaults.m_minWriteSize = szWrite;
-  c_defaults.m_maxWriteSize = 256*1024;
+  c_defaults.m_maxWriteSize = maxWriteSize;
   c_defaults.m_lcp_buffer_size = szDataBuf;
   
 

storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp

@@ -3130,6 +3130,7 @@ Dbtup::nr_delete(Signal* signal, Uint32 senderData,
     }
 
     PagePtr disk_page = *(PagePtr*)&m_pgman.m_ptr;
+    disk_page_set_dirty(disk_page);
 
     preq.m_callback.m_callbackFunction =
       safe_cast(&Dbtup::nr_delete_logbuffer_callback);      
@@ -3164,7 +3165,7 @@ Dbtup::nr_delete_page_callback(Signal* signal,
   Ptr<GlobalPage> gpage;
   m_global_page_pool.getPtr(gpage, page_id);
   PagePtr pagePtr= *(PagePtr*)&gpage;
-
+  disk_page_set_dirty(pagePtr);
   Dblqh::Nr_op_info op;
   op.m_ptr_i = userpointer;
   op.m_disk_ref.m_page_no = pagePtr.p->m_page_no;

storage/ndb/src/mgmsrv/ConfigInfo.cpp

@@ -1235,7 +1235,19 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     false,
     ConfigInfo::CI_INT,
     "32K",
-    "0",
+    "2K",
+    STR_VALUE(MAX_INT_RNIL) },
+
+  { 
+    CFG_DB_BACKUP_MAX_WRITE_SIZE,
+    "BackupMaxWriteSize",
+    DB_TOKEN,
+    "Max size of filesystem writes made by backup (in bytes)",
+    ConfigInfo::CI_USED,
+    false,
+    ConfigInfo::CI_INT,
+    "256K",
+    "2K",
     STR_VALUE(MAX_INT_RNIL) },
 
   { 

storage/ndb/test/ndbapi/testDict.cpp

@@ -109,7 +109,7 @@ int runCreateTheTable(NDBT_Context* ctx, NDBT_Step* step){
   const NdbDictionary::Table* pTab = ctx->getTab();
 
   // Try to create table in db
-  if (pTab->createTableInDb(pNdb) != 0){
+  if (NDBT_Tables::createTable(pNdb, pTab->getName()) != 0){
     return NDBT_FAILED;
   }
 
@@ -151,7 +151,7 @@ int runCreateTableWhenDbIsFull(NDBT_Context* ctx, NDBT_Step* step){
     }
 
     // Try to create table in db
-    if (pTab->createTableInDb(pNdb) == 0){
+    if (NDBT_Tables::createTable(pNdb, pTab->getName()) == 0){
       result = NDBT_FAILED;
     }
 
@@ -203,7 +203,7 @@ int runCreateAndDrop(NDBT_Context* ctx, NDBT_Step* step){
 
     ndbout << i << ": ";    
     // Try to create table in db
-    if (pTab->createTableInDb(pNdb) != 0){
+    if (NDBT_Tables::createTable(pNdb, pTab->getName()) != 0){
       return NDBT_FAILED;
     }
 
@@ -254,7 +254,8 @@ int runCreateAndDropWithData(NDBT_Context* ctx, NDBT_Step* step){
   while (i < loops){
     ndbout << i << ": ";
     // Try to create table in db
-    if (pTab->createTableInDb(pNdb) != 0){
+    
+    if (NDBT_Tables::createTable(pNdb, pTab->getName()) != 0){
       return NDBT_FAILED;
     }
 
@@ -336,7 +337,7 @@ int runCreateAndDropDuring(NDBT_Context* ctx, NDBT_Step* step){
     Ndb* pNdb = GETNDB(step);
     g_debug << "Creating table" << endl;
 
-    if (pTab->createTableInDb(pNdb) != 0){
+    if (NDBT_Tables::createTable(pNdb, pTab->getName()) != 0){
       g_err << "createTableInDb failed" << endl;
       result =  NDBT_FAILED;
       continue;
@@ -357,7 +358,6 @@ int runCreateAndDropDuring(NDBT_Context* ctx, NDBT_Step* step){
 
     g_debug << "Dropping table" << endl;
 
-
     if (pNdb->getDictionary()->dropTable(pTab2->getName()) != 0){
       g_err << "Failed to drop "<<pTab2->getName()<<" in db" << endl;
       result =  NDBT_FAILED;

support-files/mysql.spec.sh

@@ -641,6 +641,7 @@ fi
 %attr(755, root, root) %{_bindir}/ndb_desc
 %attr(755, root, root) %{_bindir}/ndb_show_tables
 %attr(755, root, root) %{_bindir}/ndb_test_platform
+%attr(755, root, root) %{_bindir}/ndb_config
 
 %files ndb-extra
 %defattr(-,root,root,0755)