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.1948 05/11/08 17:30:41 joerg@stripped +8 -0
Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree.
storage/ndb/src/kernel/blocks/lgman.hpp
1.2 05/11/08 17:30:36 joerg@stripped +1 -1
Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree.
storage/ndb/src/kernel/blocks/lgman.cpp
1.2 05/11/08 17:30:36 joerg@stripped +1 -5
Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree.
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
1.17 05/11/08 17:30:36 joerg@stripped +1 -1
Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree.
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
1.25 05/11/08 17:30:36 joerg@stripped +2 -2
Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree.
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
1.2 05/11/08 17:30:36 joerg@stripped +3 -3
Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree.
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
1.6 05/11/08 17:30:35 joerg@stripped +1 -1
Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree.
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
1.5 05/11/08 17:30:35 joerg@stripped +1 -1
Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree.
storage/ndb/include/kernel/kernel_types.h
1.6 05/11/08 17:30:35 joerg@stripped +1 -1
Compile fixes for NDB on Solaris and HP-UX, provided by Tomas and Jonas, re-applied in new tree.
# 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.1/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp 2005-11-07 12:19:12 +01:00
+++ 1.2/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp 2005-11-08 17:30:36 +01:00
@@ -976,7 +976,7 @@
Logfile_client::Change c[1] = {{ &alloc, sizeof(alloc) >> 2 } };
- Uint64 lsn= lsman.add_entry<1>(c);
+ Uint64 lsn= lsman.add_entry(c, 1);
m_pgman.update_lsn(* key, lsn);
return lsn;
@@ -1005,7 +1005,7 @@
ndbassert(4*(3 + sz + 1) == (sizeof(update) + 4*sz - 4));
- Uint64 lsn= lsman.add_entry<3>(c);
+ Uint64 lsn= lsman.add_entry(c, 3);
m_pgman.update_lsn(* key, lsn);
return lsn;
@@ -1034,7 +1034,7 @@
ndbassert(4*(3 + sz + 1) == (sizeof(free) + 4*sz - 4));
- Uint64 lsn= lsman.add_entry<3>(c);
+ Uint64 lsn= lsman.add_entry(c, 3);
m_pgman.update_lsn(* key, lsn);
return lsn;
--- 1.1/storage/ndb/src/kernel/blocks/lgman.cpp 2005-11-07 12:19:14 +01:00
+++ 1.2/storage/ndb/src/kernel/blocks/lgman.cpp 2005-11-08 17:30:36 +01:00
@@ -1882,9 +1882,8 @@
return -1;
}
-template<Uint32 cnt>
Uint64
-Logfile_client::add_entry(const Change* src)
+Logfile_client::add_entry(const Change* src, Uint32 cnt)
{
Uint32 i, tot= 0;
for(i= 0; i<cnt; i++)
@@ -1936,9 +1935,6 @@
return last_lsn;
}
}
-
-template Uint64 Logfile_client::add_entry<1>(const Change*);
-template Uint64 Logfile_client::add_entry<3>(const Change*);
void
Lgman::execSTART_RECREQ(Signal* signal)
--- 1.1/storage/ndb/src/kernel/blocks/lgman.hpp 2005-11-07 12:19:14 +01:00
+++ 1.2/storage/ndb/src/kernel/blocks/lgman.hpp 2005-11-08 17:30:36 +01:00
@@ -320,7 +320,7 @@
};
Uint64 add_entry(const void*, Uint32 len);
- template<Uint32 cnt> Uint64 add_entry(const Change*);
+ Uint64 add_entry(const Change*, Uint32 cnt);
Uint64 add_entry(Local_key, void * base, Change*);
Uint64 add_entry(Local_key, Uint32 off, Uint32 change);
--- 1.5/storage/ndb/include/kernel/kernel_types.h 2005-11-07 16:27:39 +01:00
+++ 1.6/storage/ndb/include/kernel/kernel_types.h 2005-11-08 17:30:35 +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-11-07 12:19:07 +01:00
+++ 1.5/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp 2005-11-08 17:30:35 +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-11-07 12:19:07 +01:00
+++ 1.6/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp 2005-11-08 17:30:35 +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.24/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp 2005-11-07 16:47:48 +01:00
+++ 1.25/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp 2005-11-08 17:30:36 +01:00
@@ -2811,7 +2811,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);
@@ -2896,7 +2896,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.16/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp 2005-11-07 12:19:07 +01:00
+++ 1.17/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp 2005-11-08 17:30:36 +01:00
@@ -604,7 +604,7 @@
Logfile_client::Change c[1] = {{ &create, sizeof(create) >> 2 } };
- Uint64 lsn= lsman.add_entry<1>(c);
+ Uint64 lsn= lsman.add_entry(c, 1);
signal->theData[0] = fragOperPtr.p->lqhPtrFrag;
signal->theData[1] = 1;
| Thread |
|---|
| • bk commit into 5.1 tree (joerg:1.1948) | Joerg Bruehe | 8 Nov |
