#At file:///home/tomas/mysql_src/mysql-5.1-telco-6.4/
3079 Tomas Ulin 2008-11-14 [merge]
merge
modified:
storage/ndb/include/ndb_version.h.in
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
storage/ndb/src/mgmsrv/ConfigManager.cpp
=== modified file 'storage/ndb/include/ndb_version.h.in'
--- a/storage/ndb/include/ndb_version.h.in 2008-11-13 13:36:29 +0000
+++ b/storage/ndb/include/ndb_version.h.in 2008-11-14 09:12:01 +0000
@@ -191,19 +191,21 @@ inline
int
ndbd_suma_dictlock_startme(Uint32 x)
{
- const Uint32 major = (x >> 16) & 0xFF;
- const Uint32 minor = (x >> 8) & 0xFF;
-
if (x >= NDB_VERSION_D)
return 1;
- if (major >= 6)
{
- if (minor == 2)
+ const Uint32 major = (x >> 16) & 0xFF;
+ const Uint32 minor = (x >> 8) & 0xFF;
+
+ if (major >= 6)
+ {
+ if (minor == 2)
return x >= NDBD_SUMA_DICT_LOCK_62;
+ }
+
+ return x >= NDBD_SUMA_DICT_LOCK_63;
}
-
- return x >= NDBD_SUMA_DICT_LOCK_63;
}
#define NDBD_LONG_LIST_TABLES_CONF_62 NDB_MAKE_VERSION(6,2,16)
@@ -214,19 +216,21 @@ inline
int
ndbd_LIST_TABLES_CONF_long_signal(Uint32 x)
{
- const Uint32 major = (x >> 16) & 0xFF;
- const Uint32 minor = (x >> 8) & 0xFF;
-
if (x >= NDB_VERSION_D)
return 1;
- if (major >= 6)
{
- if (minor == 2)
- return x >= NDBD_LONG_LIST_TABLES_CONF_62;
+ const Uint32 major = (x >> 16) & 0xFF;
+ const Uint32 minor = (x >> 8) & 0xFF;
+
+ if (major >= 6)
+ {
+ if (minor == 2)
+ return x >= NDBD_LONG_LIST_TABLES_CONF_62;
+ }
+
+ return x >= NDBD_LONG_LIST_TABLES_CONF_63;
}
-
- return x >= NDBD_LONG_LIST_TABLES_CONF_63;
}
#if NOT_YET
@@ -294,16 +298,18 @@ ndb_takeovertc(Uint32 x)
if (x >= NDB_VERSION_D)
return 1;
- const Uint32 major = (x >> 16) & 0xFF;
- const Uint32 minor = (x >> 8) & 0xFF;
-
- if (major >= 6)
{
- if (minor == 2)
- return x >= NDBD_API_TAKE_OVERTCCONF_62;
+ const Uint32 major = (x >> 16) & 0xFF;
+ const Uint32 minor = (x >> 8) & 0xFF;
+
+ if (major >= 6)
+ {
+ if (minor == 2)
+ return x >= NDBD_API_TAKE_OVERTCCONF_62;
+ }
+
+ return x >= NDBD_API_TAKE_OVERTCCONF_63;
}
-
- return x >= NDBD_API_TAKE_OVERTCCONF_63;
}
#endif
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp 2008-10-09 19:17:11 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp 2008-11-14 11:21:17 +0000
@@ -2260,7 +2260,8 @@ private:
void writeFileHeaderOpen(Signal* signal, Uint32 type);
void writeInitMbyte(Signal* signal);
void writeSinglePage(Signal* signal, Uint32 pageNo,
- Uint32 wordWritten, Uint32 place);
+ Uint32 wordWritten, Uint32 place,
+ bool sync = true);
void buildLinkedLogPageList(Signal* signal);
void changeMbyte(Signal* signal);
Uint32 checkIfExecLog(Signal* signal);
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2008-11-08 21:43:03 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2008-11-14 11:21:17 +0000
@@ -13807,7 +13807,7 @@ void Dblqh::openFileInitLab(Signal* sign
logFilePtr.p->logFileStatus = LogFileRecord::OPEN_INIT;
seizeLogpage(signal);
writeSinglePage(signal, (clogFileSize * ZPAGES_IN_MBYTE) - 1,
- ZPAGE_SIZE - 1, __LINE__);
+ ZPAGE_SIZE - 1, __LINE__, false);
lfoPtr.p->lfoState = LogFileOperationRecord::INIT_WRITE_AT_END;
return;
}//Dblqh::openFileInitLab()
@@ -13848,7 +13848,7 @@ void Dblqh::initFirstPageLab(Signal* sig
logPagePtr.p->logPageWord[ZPOS_LOG_LAP] = 1;
logPagePtr.p->logPageWord[ZPAGE_HEADER_SIZE] = ZCOMPLETED_GCI_TYPE;
logPagePtr.p->logPageWord[ZPAGE_HEADER_SIZE + 1] = 1;
- writeSinglePage(signal, 1, ZPAGE_SIZE - 1, __LINE__);
+ writeSinglePage(signal, 1, ZPAGE_SIZE - 1, __LINE__, false);
lfoPtr.p->lfoState = LogFileOperationRecord::WRITE_GCI_ZERO;
return;
}//if
@@ -14320,12 +14320,13 @@ void Dblqh::writeFileHeaderOpen(Signal*
/* LOG FILE. THIS HAS SPECIAL SIGNIFANCE TO FIND */
/* THE END OF THE LOG AT SYSTEM RESTART. */
/* ------------------------------------------------------- */
- writeSinglePage(signal, 0, ZPAGE_SIZE - 1, __LINE__);
if (wmoType == ZINIT) {
jam();
+ writeSinglePage(signal, 0, ZPAGE_SIZE - 1, __LINE__, false);
lfoPtr.p->lfoState = LogFileOperationRecord::INIT_FIRST_PAGE;
} else {
jam();
+ writeSinglePage(signal, 0, ZPAGE_SIZE - 1, __LINE__, true);
lfoPtr.p->lfoState = LogFileOperationRecord::FIRST_PAGE_WRITE_IN_LOGFILE;
}//if
logFilePtr.p->filePosition = 1;
@@ -14355,7 +14356,7 @@ void Dblqh::writeInitMbyte(Signal* signa
{
initLogpage(signal);
writeSinglePage(signal, logFilePtr.p->currentMbyte * ZPAGES_IN_MBYTE,
- ZPAGE_SIZE - 1, __LINE__);
+ ZPAGE_SIZE - 1, __LINE__, false);
lfoPtr.p->lfoState = LogFileOperationRecord::WRITE_INIT_MBYTE;
checkReportStatus(signal);
}//Dblqh::writeInitMbyte()
@@ -14367,7 +14368,8 @@ void Dblqh::writeInitMbyte(Signal* signa
/* SUBROUTINE SHORT NAME: WSP */
/* ------------------------------------------------------------------------- */
void Dblqh::writeSinglePage(Signal* signal, Uint32 pageNo,
- Uint32 wordWritten, Uint32 place)
+ Uint32 wordWritten, Uint32 place,
+ bool sync)
{
seizeLfo(signal);
initLfo(signal);
@@ -14389,7 +14391,7 @@ void Dblqh::writeSinglePage(Signal* sign
signal->theData[0] = logFilePtr.p->fileRef;
signal->theData[1] = cownref;
signal->theData[2] = lfoPtr.i;
- signal->theData[3] = ZLIST_OF_PAIRS_SYNCH;
+ signal->theData[3] = sync ? ZLIST_OF_PAIRS_SYNCH : ZLIST_OF_PAIRS;
signal->theData[4] = ZVAR_NO_LOG_PAGE_WORD;
signal->theData[5] = 1; /* ONE PAGE WRITTEN */
signal->theData[6] = logPagePtr.i;
=== modified file 'storage/ndb/src/mgmsrv/ConfigManager.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigManager.cpp 2008-11-13 07:52:42 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigManager.cpp 2008-11-14 09:19:30 +0000
@@ -1530,6 +1530,9 @@ ConfigManager::run()
execCONFIG_CHECK_CONF(ss, sig);
break;
+ case GSN_TAKE_OVERTCCONF:
+ break;
+
default:
sig->print();
g_eventLogger->error("Unknown signal received. SignalNumber: "
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (tomas.ulin:3079) | Tomas Ulin | 17 Nov |
