Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-02-07 07:47:34+01:00, jonas@stripped +6 -0
ndb - wl3600
remove warning
BitKeeper/deleted/.del-AlterTrig.cpp@stripped, 2008-01-14 13:16:16+01:00, jonas@stripped +0 -0
Delete: storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp
BitKeeper/deleted/.del-AlterTrig.hpp@stripped, 2008-01-14 13:11:50+01:00, jonas@stripped +0 -0
Delete: storage/ndb/include/kernel/signaldata/AlterTrig.hpp
BitKeeper/deleted/.del-AlterTrigImpl.cpp@stripped, 2008-01-14 13:16:16+01:00, jonas@stripped +0 -0
Delete: storage/ndb/src/common/debugger/signaldata/AlterTrigImpl.cpp
BitKeeper/deleted/.del-AlterTrigImpl.hpp@stripped, 2008-01-14 13:11:50+01:00, jonas@stripped +0 -0
Delete: storage/ndb/include/kernel/signaldata/AlterTrigImpl.hpp
storage/ndb/include/kernel/signaldata/DihContinueB.hpp@stripped, 2008-02-07 07:47:32+01:00, jonas@stripped +1 -1
remove compiler warning
storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp@stripped, 2008-02-07 07:47:32+01:00, jonas@stripped +0 -4
remove compiler warning
diff -Nrup a/storage/ndb/include/kernel/signaldata/AlterTrig.hpp b/storage/ndb/include/kernel/signaldata/AlterTrig.hpp
--- a/storage/ndb/include/kernel/signaldata/AlterTrig.hpp 2007-12-25 17:25:54 +01:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,74 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
-#ifndef ALTER_TRIG_HPP
-#define ALTER_TRIG_HPP
-
-#include "SignalData.hpp"
-#include <Bitmask.hpp>
-#include <trigger_definitions.h>
-
-struct AlterTrigReq {
- enum RequestType {
- AlterTriggerOnline = 1,
- AlterTriggerOffline = 2
- };
-
- STATIC_CONST( SignalLength = 8 );
-
- Uint32 clientRef;
- Uint32 clientData;
- Uint32 transId;
- Uint32 transKey;
- Uint32 requestInfo;
- Uint32 tableId;
- Uint32 tableVersion;
- Uint32 triggerId;
-};
-
-struct AlterTrigConf {
- STATIC_CONST( InternalLength = 3 );
- STATIC_CONST( SignalLength = 5 );
-
- Uint32 senderRef;
- union { Uint32 clientData, senderData; };
- Uint32 transId;
- Uint32 tableId;
- Uint32 triggerId;
-};
-
-struct AlterTrigRef {
- enum ErrorCode {
- NoError = 0,
- Busy = 701,
- TriggerNotFound = 4238,
- TriggerExists = 4239,
- BadRequestType = 4247
- };
-
- STATIC_CONST( SignalLength = 9 );
-
- Uint32 senderRef;
- union { Uint32 clientData, senderData; };
- Uint32 transId;
- Uint32 tableId;
- Uint32 triggerId;
- Uint32 errorCode;
- Uint32 errorLine;
- Uint32 errorNodeId;
- Uint32 masterNodeId;
-};
-
-#endif
diff -Nrup a/storage/ndb/include/kernel/signaldata/AlterTrigImpl.hpp b/storage/ndb/include/kernel/signaldata/AlterTrigImpl.hpp
--- a/storage/ndb/include/kernel/signaldata/AlterTrigImpl.hpp 2007-12-25 17:25:09 +01:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,68 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
-#ifndef ALTER_TRIG_IMPL_HPP
-#define ALTER_TRIG_IMPL_HPP
-
-#include "SignalData.hpp"
-
-struct AlterTrigImplReq {
- enum RequestType {
- AlterTriggerOnline = 1,
- AlterTriggerOffline = 2
- };
-
- STATIC_CONST( SignalLength = 6 );
-
- Uint32 senderRef;
- Uint32 senderData;
- Uint32 requestType;
- Uint32 tableId;
- Uint32 tableVersion;
- Uint32 triggerId;
-};
-
-struct AlterTrigImplConf {
- STATIC_CONST( SignalLength = 4 );
-
- Uint32 senderRef;
- Uint32 senderData;
- // wl3600_todo BACKUP and SUMA dont use this so these are redundant
- Uint32 tableId;
- Uint32 triggerId;
-};
-
-struct AlterTrigImplRef {
- enum ErrorCode {
- NoError = 0,
- Busy = 701,
- TriggerNotFound = 4238,
- TriggerExists = 4239,
- BadRequestType = 4247
- };
-
- STATIC_CONST( SignalLength = 8 );
-
- Uint32 senderRef;
- Uint32 senderData;
- Uint32 tableId;
- Uint32 triggerId;
- Uint32 errorCode;
- Uint32 errorLine;
- Uint32 errorNodeId;
- Uint32 masterNodeId;
-};
-
-#endif
diff -Nrup a/storage/ndb/include/kernel/signaldata/DihContinueB.hpp b/storage/ndb/include/kernel/signaldata/DihContinueB.hpp
--- a/storage/ndb/include/kernel/signaldata/DihContinueB.hpp 2007-11-23 08:15:12 +01:00
+++ b/storage/ndb/include/kernel/signaldata/DihContinueB.hpp 2008-02-07 07:47:32 +01:00
@@ -64,7 +64,7 @@ private:
ZSEND_UPDATE_TO = 40,
WAIT_DROP_TAB_WRITING_TO_FILE = 42,
- CHECK_WAIT_DROP_TAB_FAILED_LQH = 43,
+ //CHECK_WAIT_DROP_TAB_FAILED_LQH = 43,
ZTO_START_FRAGMENTS = 44
,ZCOPY_NODE_WAIT_CREATE_FRAG = 45
};
diff -Nrup a/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp b/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp
--- a/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp 2007-12-25 17:25:56 +01:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,67 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
-#include <signaldata/AlterTrig.hpp>
-
-bool
-printALTER_TRIG_REQ(FILE* output, const Uint32* theData, Uint32 len, Uint16)
-{
- const AlterTrigReq* sig = (const AlterTrigReq*)theData;
- fprintf(output, " clientRef: 0x%x", sig->clientRef);
- fprintf(output, " clientData: %u", sig->clientData);
- fprintf(output, "\n");
- fprintf(output, " transId: 0x%x", sig->transId);
- fprintf(output, " transKey: %u", sig->transKey);
- fprintf(output, " requestInfo: 0x%x", sig->requestInfo);
- fprintf(output, "\n");
- fprintf(output, " tableId: %u", sig->tableId);
- fprintf(output, " tableVersion: 0x%x", sig->tableVersion);
- fprintf(output, " triggerId: %u", sig->triggerId);
- fprintf(output, "\n");
- return true;
-}
-
-bool
-printALTER_TRIG_CONF(FILE* output, const Uint32* theData, Uint32 len, Uint16)
-{
- const AlterTrigConf* sig = (const AlterTrigConf*)theData;
- fprintf(output, " senderRef: 0x%x", sig->senderRef);
- fprintf(output, " clientData: %u", sig->clientData);
- fprintf(output, " transId: 0x%x", sig->transId);
- fprintf(output, "\n");
- fprintf(output, " tableId: %u", sig->tableId);
- fprintf(output, " triggerId: %u", sig->triggerId);
- fprintf(output, "\n");
- return true;
-}
-
-bool
-printALTER_TRIG_REF(FILE* output, const Uint32* theData, Uint32 len, Uint16)
-{
- const AlterTrigRef* sig = (const AlterTrigRef*)theData;
- fprintf(output, " senderRef: 0x%x", sig->senderRef);
- fprintf(output, " clientData: %u", sig->clientData);
- fprintf(output, " transId: 0x%x", sig->transId);
- fprintf(output, "\n");
- fprintf(output, " tableId: %u", sig->tableId);
- fprintf(output, " triggerId: %u", sig->triggerId);
- fprintf(output, "\n");
- fprintf(output, " errorCode: %u", sig->errorCode);
- fprintf(output, " errorLine: %u", sig->errorLine);
- fprintf(output, " errorNodeId: %u", sig->errorNodeId);
- fprintf(output, " masterNodeId: %u", sig->masterNodeId);
- fprintf(output, "\n");
- return true;
-}
diff -Nrup a/storage/ndb/src/common/debugger/signaldata/AlterTrigImpl.cpp b/storage/ndb/src/common/debugger/signaldata/AlterTrigImpl.cpp
--- a/storage/ndb/src/common/debugger/signaldata/AlterTrigImpl.cpp 2007-12-25 17:25:46 +01:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,62 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
-#include <signaldata/AlterTrigImpl.hpp>
-
-bool
-printALTER_TRIG_IMPL_REQ(FILE* output, const Uint32* theData, Uint32 len, Uint16)
-{
- const AlterTrigImplReq* sig = (const AlterTrigImplReq*)theData;
- fprintf(output, " senderRef: 0x%x", sig->senderRef);
- fprintf(output, " senderData: %u", sig->senderData);
- fprintf(output, " requestType: %u", sig->requestType);
- fprintf(output, "\n");
- fprintf(output, " tableId: %u", sig->tableId);
- fprintf(output, " tableVersion: 0x%x", sig->tableVersion);
- fprintf(output, " triggerId: %u", sig->triggerId);
- fprintf(output, "\n");
- return true;
-}
-
-bool
-printALTER_TRIG_IMPL_CONF(FILE* output, const Uint32* theData, Uint32 len, Uint16)
-{
- const AlterTrigImplConf* sig = (const AlterTrigImplConf*)theData;
- fprintf(output, " senderRef: 0x%x", sig->senderRef);
- fprintf(output, " senderData: %u", sig->senderData);
- fprintf(output, "\n");
- fprintf(output, " tableId: %u", sig->tableId);
- fprintf(output, " triggerId: %u", sig->triggerId);
- fprintf(output, "\n");
- return true;
-}
-
-bool
-printALTER_TRIG_IMPL_REF(FILE* output, const Uint32* theData, Uint32 len, Uint16)
-{
- const AlterTrigImplRef* sig = (const AlterTrigImplRef*)theData;
- fprintf(output, " senderRef: 0x%x", sig->senderRef);
- fprintf(output, " senderData: %u", sig->senderData);
- fprintf(output, "\n");
- fprintf(output, " tableId: %u", sig->tableId);
- fprintf(output, " triggerId: %u", sig->triggerId);
- fprintf(output, "\n");
- fprintf(output, " errorCode: %u", sig->errorCode);
- fprintf(output, " errorLine: %u", sig->errorLine);
- fprintf(output, " errorNodeId: %u", sig->errorNodeId);
- fprintf(output, " masterNodeId: %u", sig->masterNodeId);
- fprintf(output, "\n");
- return true;
-}
diff -Nrup a/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp b/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp
--- a/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp 2007-11-23 08:15:12 +01:00
+++ b/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp 2008-02-07 07:47:32 +01:00
@@ -188,10 +188,6 @@ printCONTINUEB_DBDIH(FILE * output, cons
case DihContinueB::WAIT_DROP_TAB_WRITING_TO_FILE:
fprintf(output, " Wait drop tab writing to file TableId: %d\n", theData[1]);
return true;
- case DihContinueB::CHECK_WAIT_DROP_TAB_FAILED_LQH:
- fprintf(output, " Wait drop tab FailedNodeId: %d TableId: %d\n",
- theData[1], theData[2]);
- return true;
default:
fprintf(output, " Default system error lab...\n");
break;
| Thread |
|---|
| • bk commit into 5.1 tree (jonas:1.2859) | jonas | 7 Feb |
