summaryrefslogtreecommitdiff
path: root/ndb/src
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2005-03-03 08:38:10 +0100
committerunknown <joreland@mysql.com>2005-03-03 08:38:10 +0100
commit763ce399f75b5809c801bf33d23a212427b06d84 (patch)
tree2e12a79b3507e3a9c2f935a8aa67fcd5a12e3686 /ndb/src
parenteaf72b99651ce7dcdeb637f1c667f3d558105425 (diff)
parent69a1579af0bf4fd53370b6a3fbab889ce4986a56 (diff)
downloadmariadb-git-763ce399f75b5809c801bf33d23a212427b06d84.tar.gz
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1 ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged
Diffstat (limited to 'ndb/src')
-rw-r--r--ndb/src/kernel/blocks/dbtc/DbtcMain.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
index d03c908117d..310ba6a9a0b 100644
--- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
@@ -5943,7 +5943,7 @@ int Dbtc::releaseAndAbort(Signal* signal)
signal->theData[0] = tcConnectptr.i;
signal->theData[1] = apiConnectptr.p->transid[0];
signal->theData[2] = apiConnectptr.p->transid[1];
- signal->theData[3] = hostptr.i;
+ signal->theData[3] = localHostptr.i;
signal->theData[4] = ZFALSE;
sendSignal(cownref, GSN_ABORTED, signal, 5, JBB);
}//if