summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorunknown <mskold@mysql.com>2005-04-20 11:26:57 +0200
committerunknown <mskold@mysql.com>2005-04-20 11:26:57 +0200
commit8d683973339d7d53977433fbd6a55038e6763e71 (patch)
tree3b86d1cc641c4a4386b6b97a533bd607206e88fe /ndb
parentccd4e77be70946138b41a518a03e462ae37ca543 (diff)
parenta8261608e313b2e5eb18b7b25d5b0cdeaeae239d (diff)
downloadmariadb-git-8d683973339d7d53977433fbd6a55038e6763e71.tar.gz
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/kernel/blocks/dbtc/DbtcMain.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
index 03a0590b6e2..efd4c2a46d0 100644
--- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
@@ -1838,7 +1838,6 @@ void Dbtc::execKEYINFO(Signal* signal)
do {
if (cfirstfreeDatabuf == RNIL) {
jam();
- abort();
seizeDatabuferrorLab(signal);
return;
}//if