diff options
| -rw-r--r-- | storage/ndb/include/util/SocketServer.hpp | 2 | ||||
| -rw-r--r-- | storage/ndb/src/common/util/SocketServer.cpp | 4 | ||||
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp | 3 | ||||
| -rw-r--r-- | storage/ndb/test/ndbapi/testDict.cpp | 12 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 1 |
5 files changed, 12 insertions, 10 deletions
diff --git a/storage/ndb/include/util/SocketServer.hpp b/storage/ndb/include/util/SocketServer.hpp index e131b78baa1..e766a0b99c4 100644 --- a/storage/ndb/include/util/SocketServer.hpp +++ b/storage/ndb/include/util/SocketServer.hpp @@ -75,7 +75,7 @@ public: /** * Constructor / Destructor */ - SocketServer(int maxSessions = 32); + SocketServer(unsigned maxSessions = ~(unsigned)0); ~SocketServer(); /** diff --git a/storage/ndb/src/common/util/SocketServer.cpp b/storage/ndb/src/common/util/SocketServer.cpp index 481c656b78b..f0af925cf6d 100644 --- a/storage/ndb/src/common/util/SocketServer.cpp +++ b/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); diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp index 0000796d7b2..b4e79729399 100644 --- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp +++ b/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; diff --git a/storage/ndb/test/ndbapi/testDict.cpp b/storage/ndb/test/ndbapi/testDict.cpp index 0176db8d4fd..7ade359342d 100644 --- a/storage/ndb/test/ndbapi/testDict.cpp +++ b/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; diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 4bff95b29fa..781b769b7fc 100644 --- a/support-files/mysql.spec.sh +++ b/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) |