Merge pull request #765 from mronstro/24.10-main

mronstro · web-flow · commit 725777d50236 · 2025-09-19T10:46:22.000+02:00
RONDB-956: Aborted earlier to avoid risking leaving m_queuedDatabaseP…
diff --git a/MYSQL_VERSION b/MYSQL_VERSION
@@ -1,5 +1,5 @@
 MYSQL_VERSION_MAJOR=24
 MYSQL_VERSION_MINOR=10
-MYSQL_VERSION_PATCH=12
+MYSQL_VERSION_PATCH=13
 MYSQL_VERSION_EXTRA=
 MYSQL_VERSION_MATURITY="LTS"
diff --git a/mysql-test/suite/ndb_quota/ndb_quota_commands.result b/mysql-test/suite/ndb_quota/ndb_quota_commands.result
@@ -13,7 +13,7 @@ InMemorySize = 2 MByte
 DiskSpaceSize = 0 GByte
 RatePerSec = 500
 MaxTransactionSize = 4
-MaxParallelTransactions = 4
+MaxParallelTransactions = 3
 MaxParallelComplexQueries = 0
 Database Quotas for test2
 databaseId = 14
@@ -50,7 +50,7 @@ Database Quotas for test
   DiskSpaceSize = 0 GByte
   RatePerSec = 500
   MaxTransactionSize = 4
-  MaxParallelTransactions = 4
+  MaxParallelTransactions = 3
   MaxParallelComplexQueries = 0
 
 Database Quotas for test2
@@ -76,7 +76,7 @@ DATABASE QUOTA GET command failed: Error:
 DATABASE QUOTA GET command failed: Error:
 *   703: Error
 *        Get database quotas failed with error
-DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (
 pk1 INT NOT NULL PRIMARY KEY,
 b1 CHAR(255),
@@ -108,9 +108,10 @@ b26 CHAR(255) NULL,
 b27 CHAR(255) NULL,
 b28 VARCHAR(20000) NULL
 ) engine ndb character set latin1;
-CREATE TABLE t2 (a int not null primary key) engine ndb;
-INSERT INTO t2 VALUES (1),(2),(3),(4),(5);
+CREATE TABLE t2 (a int not null primary key, b int) engine ndb;
+INSERT INTO t2 VALUES (1,0),(2,0),(3,0),(4,0),(5,0);
 ERROR HY000: Got temporary error 247 'Too many operations in a transaction in database' from NDBCLUSTER
+INSERT INTO t2 VALUES (1,0),(2,0),(3,0);
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (0, '0', '0', '0', '0',REPEAT('a', 19000)),(30,'30', '0', '0', '0',REPEAT('a', 19000));
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (1, '0', '0', '0', '0',REPEAT('a', 19000)),(31,'30', '0', '0', '0',REPEAT('a', 19000));
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (2, '0', '0', '0', '0',REPEAT('a', 19000)),(32,'30', '0', '0', '0',REPEAT('a', 19000));
@@ -177,7 +178,7 @@ DROP TABLE t2;
 Database Quota Backup command completed
 DATABASE QUOTA DROP successfully executed
 DATABASE QUOTA DROP successfully executed
-Execute DATABASE QUOTA SET test --in-memory-size = 2 --on-disk-size = 0 --rate-per-sec = 500 --max-transaction-size = 4 --max-parallel-transactions = 4 --max-parallel-complex-queries = 0
+Execute DATABASE QUOTA SET test --in-memory-size = 2 --on-disk-size = 0 --rate-per-sec = 5 --max-transaction-size = 100 --max-parallel-transactions = 10 --max-parallel-complex-queries = 0
 DATABASE QUOTA SET successfully executed
 DATABASE QUOTA SET command succeeded for RESTORE
 Execute DATABASE QUOTA SET test2 --in-memory-size = 11 --on-disk-size = 0 --rate-per-sec = 1500 --max-transaction-size = 0 --max-parallel-transactions = 0 --max-parallel-complex-queries = 0
diff --git a/mysql-test/suite/ndb_quota/ndb_quota_commands.test b/mysql-test/suite/ndb_quota/ndb_quota_commands.test
@@ -1,5 +1,5 @@
 --source include/have_ndb.inc
---exec $NDB_MGM -e "DATABASE QUOTA SET test --rate-per-sec = 500 --in-memory-size=2 --max-transaction-size=4 --max-parallel-transactions=4"
+--exec $NDB_MGM -e "DATABASE QUOTA SET test --rate-per-sec = 500 --in-memory-size=2 --max-transaction-size=4 --max-parallel-transactions=3"
 --error 255,65280
 --exec $NDB_MGM -e "DATABASE QUOTA SET test2 --rate-per-sec = 50000000 --in-memory-size=100 --on-disk-size=0"
 --exec $NDB_MGM -e "DATABASE QUOTA SET test2 --rate-per-sec = 500 --in-memory-size=10 --on-disk-size=0"
@@ -25,7 +25,7 @@
 --error 255,65280
 --exec $NDB_MGM -e "DATABASE QUOTA GET test_1234567890_1234567890_1234567890_1234567890_1234567890_1234567890_1234567890_1234567890_1234567890_1234567890_1234567890_100"
 --disable_warnings
-DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t1, t2;
 --enable_warnings
 
 CREATE TABLE t1 (
@@ -60,9 +60,10 @@ CREATE TABLE t1 (
   b28 VARCHAR(20000) NULL
 ) engine ndb character set latin1;
 
-CREATE TABLE t2 (a int not null primary key) engine ndb;
+CREATE TABLE t2 (a int not null primary key, b int) engine ndb;
 --error 1297
-INSERT INTO t2 VALUES (1),(2),(3),(4),(5);
+INSERT INTO t2 VALUES (1,0),(2,0),(3,0),(4,0),(5,0);
+INSERT INTO t2 VALUES (1,0),(2,0),(3,0);
 
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (0, '0', '0', '0', '0',REPEAT('a', 19000)),(30,'30', '0', '0', '0',REPEAT('a', 19000));
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (1, '0', '0', '0', '0',REPEAT('a', 19000)),(31,'30', '0', '0', '0',REPEAT('a', 19000));
@@ -84,11 +85,17 @@ INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (16, '0', '0', '0', '0',REPEAT('a',
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (17, '0', '0', '0', '0',REPEAT('a', 19000)),(47,'30', '0', '0', '0',REPEAT('a', 19000));
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (18, '0', '0', '0', '0',REPEAT('a', 19000)),(48,'30', '0', '0', '0', '0');
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (19, '0', '0', '0', '0',REPEAT('a', 19000)),(49,'30', '0', '0', '0', '0');
+--error 0, 1297
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (20, '0', '0', '0', '0',REPEAT('a', 19000)),(50,'30', '0', '0', '0', '0');
+--error 0, 1297
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (21, '0', '0', '0', '0',REPEAT('a', 19000)),(51,'30', '0', '0', '0', '0');
+--error 0, 1297
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (22, '0', '0', '0', '0',REPEAT('a', 19000)),(52,'30', '0', '0', '0', '0');
+--error 0, 1297
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (23, '0', '0', '0', '0',REPEAT('a', 19000)),(53,'30', '0', '0', '0', '0');
+--error 0, 1297
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (24, '0', '0', '0', '0',REPEAT('a', 19000)),(54,'30', '0', '0', '0', '0');
+--error 0, 1297
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (25, '0', '0', '0', '0',REPEAT('a', 19000)),(55,'30', '0', '0', '0', '0');
 --error 0, 1297
 INSERT INTO t1 (pk1,b1,b2,b3,b4,b28) VALUES (26, '0', '0', '0', '0',REPEAT('a', 19000)),(56,'30', '0', '0', '0', '0');
@@ -140,16 +147,118 @@ UPDATE t1 SET b28 = REPEAT('b', 19000) WHERE pk1 = 48;
 DELETE from t1 WHERE pk1 = 30;
 UPDATE t1 SET b28 = REPEAT('b', 19000) WHERE pk1 = 48;
 
+--disable_query_log
+--disable_result_log
+let $c = 100;
+while ($c)
+{
+  SELECT * from t2;
+  dec $c;
+}
+
+connect(mysqld2,127.0.0.1,root,,test,$MASTER_MYPORT1);
+connect(mysqld3,127.0.0.1,root,,test,$MASTER_MYPORT1);
+connect(mysqld4,127.0.0.1,root,,test,$MASTER_MYPORT1);
+connect(mysqld5,127.0.0.1,root,,test,$MASTER_MYPORT1);
+connect(mysqld6,127.0.0.1,root,,test,$MASTER_MYPORT1);
+
+connection default;
+BEGIN;
+INSERT INTO t2 VALUES (4,0);
+
+connection mysqld2;
+BEGIN;
+INSERT INTO t2 VALUES (5,0);
+
+connection mysqld3;
+BEGIN;
+INSERT INTO t2 VALUES (6,0);
+
+connection mysqld4;
+BEGIN;
+--error 1297
+INSERT INTO t2 VALUES (7,0);
+
+connection mysqld5;
+BEGIN;
+--error 1297
+INSERT INTO t2 VALUES (8,0);
+
+connection mysqld6;
+BEGIN;
+--error 1297
+INSERT INTO t2 VALUES (9,0);
+
+connection default;
+COMMIT;
+
+connection mysqld2;
+COMMIT;
+
+connection mysqld3;
+COMMIT;
+
+connection default;
+SELECT * FROM t2;
+
+--exec $NDB_MGM -e "DATABASE QUOTA ALTER test --rate-per-sec = 5 --in-memory-size=2 --max-transaction-size=100 --max-parallel-transactions=10"
+
+--error 0,1297
+SELECT * from t2;
+--error 0,1297
+SELECT * from t2;
+--error 0,1297
+UPDATE t2 SET b = 0 where a = 4;
+COMMIT;
+
+connection mysqld2;
+--error 0,1297
+SELECT * from t2;
+--error 0,1297
+UPDATE t2 SET b = 0 where a = 5;
+COMMIT;
+
+connection mysqld3;
+--error 0,1297
+SELECT * from t2;
+--error 0,1297
+UPDATE t2 SET b = 0 where a = 6;
+COMMIT;
+
+connection mysqld4;
+--error 0,1297
+SELECT * from t2;
+--error 0,1297
+UPDATE t2 SET b = 0 where a = 0;
+COMMIT;
+
+connection mysqld5;
+--error 0,1297
+SELECT * from t2;
+--error 0,1297
+UPDATE t2 SET b = 0 where a = 1;
+COMMIT;
+
+connection mysqld6;
+--error 0,1297
+SELECT * from t2;
+--error 0,1297
+UPDATE t2 SET b = 0 where a = 2;
+COMMIT;
+
+--enable_result_log
+--enable_query_log
+
+connection default;
+
 DROP TABLE t1;
 DROP TABLE t2;
 
---disable_query_log
 if (!$NDB_BACKUP_DIR)
 {
   --die Need NDB_BACKUP_DIR variable
 }
 --let BACKUP_FILE=$NDB_BACKUP_DIR/backup.txt
---disable_query_log
 --exec $NDB_MGM -e "DATABASE QUOTA BACKUP $BACKUP_FILE"
 --exec $NDB_MGM -e "DATABASE QUOTA DROP test"
 --exec $NDB_MGM -e "DATABASE QUOTA DROP test2"
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -3795,7 +3795,7 @@ void Dblqh::execTAB_COMMITREQ(Signal *signal) {
   NdbMutex_Unlock(&tabptr.p->m_usage_count);
 #endif
   tabptr.p->usageCountR = 0;
-  D(tabptr.i << "Init2 usageCountR = 0");
+  D(tabptr.i << "Init2 usageCountR and W = 0");
   tabptr.p->usageCountW = 0;
   tabptr.p->tableStatus = Tablerec::TABLE_DEFINED;
   DEB_SCHEMA_VERSION(
@@ -4118,7 +4118,8 @@ void Dblqh::dropTab_wait_usage(Signal *signal) {
 
   if (tabPtr.p->usageCountR > 0 || tabPtr.p->usageCountW > 0) {
     jam();
-    D(tabPtr.i << "usageCountR = " << tabPtr.p->usageCountR);
+    D(tabPtr.i << "usageCountR = " << tabPtr.p->usageCountR
+      << "usageCountW = " << tabPtr.p->usageCountW);
 #ifdef DEBUG_USAGE_COUNT
     NdbMutex_Lock(&tabPtr.p->m_usage_count);
     TcConnectionrecPtr tcPtr;
@@ -9384,6 +9385,9 @@ void Dblqh::execLQHKEYREQ(Signal *signal) {
   else
   {
     tabptr.p->usageCountW++;
+    D("++usageCountW[" << tabptr.i << "] = " << tabptr.p->usageCountW
+      << " transid[0x" << hex << tcConnectptr.p->transid[0]
+      << ",0x" << hex << tcConnectptr.p->transid[1] << "]");
   }
 
   if (LqhKeyReq::getNrCopyFlag(Treqinfo) &&
@@ -14099,6 +14103,9 @@ void Dblqh::releaseTcrec(Signal *signal, TcConnectionrecPtr locTcConnectptr) {
     {
       Uint32 pre_usageCountW = tabPtr.p->usageCountW--;
       ndbrequire(pre_usageCountW > 0);
+      D("--usageCountW[" << tabPtr.i << "] = " << tabPtr.p->usageCountW
+        << " transid: 0x" << hex << locTcConnectptr.p->transid[0]
+        << ", 0x" << hex << locTcConnectptr.p->transid[1]);
     }
   }
   locTcConnectptr.p->original_operation = 0xFF;
@@ -33049,7 +33056,7 @@ Dblqh::initTable(Tablerec *tabPtrP)
   tabPtrP->tableStatus = Tablerec::NOT_DEFINED;
   tabPtrP->usageCountR = 0;
   tabPtrP->usageCountW = 0;
-  D(tabptr.i << "Init usageCountR = 0");
+  D(tabptr.i << "Init usageCountR and W = 0");
   tabPtrP->m_addfragptr_i = RNIL;
   tabPtrP->num_fragments_in_array = 0;
   tabPtrP->num_fragments = 0;
diff --git a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
diff --git a/storage/ndb/src/ndbapi/NdbOperationExec.cpp b/storage/ndb/src/ndbapi/NdbOperationExec.cpp
