database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge

Browse Source 
BitKeeper/deleted/.del-Epilogue.mk~60f7edf886726154:
  Auto merged
BitKeeper/deleted/.del-Makefile_old~1f37e763ba5d06d0:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
ndb/src/kernel/Main.cpp:
  Auto merged
This commit is contained in:
unknown
2004-06-11 12:16:03 +02:00
parent 9e7770346f 6ca4b6cd19
commit f9b9bebd4e
739 changed files with 14583 additions and 14187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/include/kernel/signaldata/TcKeyConf.hpp
View File

@ -111,7 +111,7 @@ inline
void
TcKeyConf::setNoOfOperations(Uint32 & confInfo, Uint32 noOfOps){
ASSERT_MAX(noOfOps, 65535, "TcKeyConf::setNoOfOperations");
confInfo |= noOfOps;
confInfo = (confInfo & 0xFFFF) | noOfOps;
}
inline