diff options
author | unknown <pekka@orca.ndb.mysql.com> | 2006-10-25 17:32:32 +0200 |
---|---|---|
committer | unknown <pekka@orca.ndb.mysql.com> | 2006-10-25 17:32:32 +0200 |
commit | 60b5420bff1f9d8cb4dd691df8ea3c6c25a36a4a (patch) | |
tree | b9cc49355b7e1075cbd0b4331f232fd4565f78d6 | |
parent | 62324a4426a1b9f1601af47b8ae1a1e6549a83eb (diff) | |
parent | 1104ff49c9937f0c8e98c90f4161b47dbea2c4a7 (diff) | |
download | mariadb-git-60b5420bff1f9d8cb4dd691df8ea3c6c25a36a4a.tar.gz |
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
Auto merged
-rw-r--r-- | storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp index 7d10e4c9cb2..fab2de5022d 100644 --- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp +++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp @@ -825,7 +825,6 @@ Dbtux::scanNext(ScanOpPtr scanPtr, bool fromMaintReq) // scan direction const unsigned idir = scan.m_descending; // 0, 1 const int jdir = 1 - 2 * (int)idir; // 1, -1 - unpackBound(*scan.m_bound[1 - idir], c_dataBuffer); // use copy of position TreePos pos = scan.m_scanPos; // get and remember original node |