Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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
1.1958 05/11/04 10:23:23 joerg@stripped +5 -0
Compile fix for NDB in 5.1.2 on Solaris, provided by Jonas Oreland.
storage/ndb/test/src/HugoCalculator.cpp
1.22 05/11/04 10:23:18 joerg@stripped +0 -1
Compile fix for NDB in 5.1.2 on Solaris, provided by Jonas Oreland.
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
1.23 05/11/04 10:23:18 joerg@stripped +2 -2
Compile fix for NDB in 5.1.2 on Solaris, provided by Jonas Oreland.
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
1.6 05/11/04 10:23:18 joerg@stripped +1 -1
Compile fix for NDB in 5.1.2 on Solaris, provided by Jonas Oreland.
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
1.5 05/11/04 10:23:18 joerg@stripped +1 -1
Compile fix for NDB in 5.1.2 on Solaris, provided by Jonas Oreland.
storage/ndb/include/kernel/kernel_types.h
1.7 05/11/04 10:23:18 joerg@stripped +1 -1
Compile fix for NDB in 5.1.2 on Solaris, provided by Jonas Oreland.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: joerg
# Host: trift2.
# Root: /M51/clone-5.1
--- 1.6/storage/ndb/include/kernel/kernel_types.h 2005-10-25 10:09:00 +02:00
+++ 1.7/storage/ndb/include/kernel/kernel_types.h 2005-11-04 10:23:18 +01:00
@@ -59,7 +59,7 @@
Uint32 ref() const { return (m_page_no << MAX_TUPLES_BITS) | m_page_idx ;}
- Local_key& operator= (Uint32 ref) {
+ Local_key& assref (Uint32 ref) {
m_page_no =ref >> MAX_TUPLES_BITS;
m_page_idx = ref & MAX_TUPLES_PER_PAGE;
return *this;
--- 1.4/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp 2005-10-25 10:09:00 +02:00
+++ 1.5/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp 2005-11-04 10:23:18 +01:00
@@ -153,7 +153,7 @@
Ptr<Var_page> vpage;
Uint32 ref= * tuple_ptr->get_var_part_ptr(regTabPtr.p);
Local_key tmp;
- tmp=ref;
+ tmp.assref(ref);
sz= 0;
idx= tmp.m_page_idx;
--- 1.5/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp 2005-10-13 10:52:15 +02:00
+++ 1.6/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp 2005-11-04 10:23:18 +01:00
@@ -210,7 +210,7 @@
Uint32 *ref= tuple_ptr->get_var_part_ptr(regTabPtr);
memcpy(tuple_ptr, copy, 4*(Tuple_header::HeaderSize+fix_size));
- Local_key tmp; tmp= *ref;
+ Local_key tmp; tmp.assref(*ref);
if(0) printf("%p %d %d (%d bytes) - ref: %x ", tuple_ptr,
regOperPtr->m_tuple_location.m_page_no,
regOperPtr->m_tuple_location.m_page_idx,
--- 1.22/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp 2005-10-25 10:09:00 +02:00
+++ 1.23/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp 2005-11-04 10:23:18 +01:00
@@ -2759,7 +2759,7 @@
if(ptr->m_header_bits & Tuple_header::CHAINED_ROW)
{
assert(len == fix_sz + 1);
- Local_key tmp; tmp= *part;
+ Local_key tmp; tmp.assref(*part);
Ptr<Var_page> tmpPage;
part= get_ptr(&tmpPage, *(Var_part_ref*)part);
len= tmpPage.p->get_entry_len(tmp.m_page_idx);
@@ -2844,7 +2844,7 @@
else
{
Local_key tmp;
- tmp= *org->get_var_part_ptr(regTabPtr);
+ tmp.assref(*org->get_var_part_ptr(regTabPtr));
idx= tmp.m_page_idx;
alloc= pageP->get_entry_len(idx) & ~Var_page::CHAIN;
if(!(pageP->get_entry_len(idx) & Var_page::CHAIN))
--- 1.21/storage/ndb/test/src/HugoCalculator.cpp 2005-10-13 10:52:15 +02:00
+++ 1.22/storage/ndb/test/src/HugoCalculator.cpp 2005-11-04 10:23:18 +01:00
@@ -17,7 +17,6 @@
#include <ndb_global.h>
#include "HugoCalculator.hpp"
#include <NDBT.hpp>
-#include <Base64.hpp>
static
Uint32
| Thread |
|---|
| • bk commit into 5.1 tree (joerg:1.1958) | Joerg Bruehe | 4 Nov |
