Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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@stripped, 2008-03-18 21:05:09+01:00, jonas@stripped +3 -0
ndb - lcp cpu utilization
fix regressions
mysql-test/Makefile.am@stripped, 2008-03-18 21:05:06+01:00, jonas@stripped +4 -0
fix mysql-test-run dist-hook etc...
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@stripped, 2008-03-18 21:05:06+01:00, jonas@stripped +33 -15
fix dyn-attr only tables
storage/ndb/tools/restore/Restore.cpp@stripped, 2008-03-18 21:05:06+01:00, jonas@stripped +0 -6
fix incorrect merge (wrt to timestamp in ndb_restore)
diff -Nrup a/mysql-test/Makefile.am b/mysql-test/Makefile.am
--- a/mysql-test/Makefile.am 2008-02-11 15:41:53 +01:00
+++ b/mysql-test/Makefile.am 2008-03-18 21:05:06 +01:00
@@ -47,6 +47,7 @@ dist-hook:
$(distdir)/std_data/ndb_backup51_data_le \
$(distdir)/std_data/ndb_backup51_d2_be \
$(distdir)/std_data/ndb_backup51_d2_le \
+ $(distdir)/std_data/ndb_backup_packed \
$(distdir)/std_data/parts \
$(distdir)/lib \
$(distdir)/lib/My
@@ -80,6 +81,7 @@ dist-hook:
$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(distdir)/std_data/ndb_backup51_data_le
$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_d2_be/BACKUP* $(distdir)/std_data/ndb_backup51_d2_be
$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_d2_le/BACKUP* $(distdir)/std_data/ndb_backup51_d2_le
+ $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup_packed/BACKUP* $(distdir)/std_data/ndb_backup_packed
$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(distdir)/std_data/parts
$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(distdir)/lib/My
@@ -100,6 +102,7 @@ install-data-local:
$(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le \
$(DESTDIR)$(testdir)/std_data/ndb_backup51_d2_be \
$(DESTDIR)$(testdir)/std_data/ndb_backup51_d2_le \
+ $(DESTDIR)$(testdir)/std_data/ndb_backup_packed \
$(DESTDIR)$(testdir)/std_data/parts \
$(DESTDIR)$(testdir)/lib \
$(DESTDIR)$(testdir)/lib/My
@@ -138,6 +141,7 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le
$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_d2_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_d2_be
$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_d2_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_d2_le
+ $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup_packed/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup_packed
$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(DESTDIR)$(testdir)/std_data/parts
$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(DESTDIR)$(testdir)/lib/My
diff -Nrup a/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp 2008-03-18 08:12:37 +01:00
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp 2008-03-18 21:05:06 +01:00
@@ -2841,23 +2841,33 @@ Dbtup::read_lcp(const Uint32* inBuf, Uin
Uint32 fixsz = 4 * (req_struct->check_offset[MM] - Tuple_header::HeaderSize);
Uint32 varlen = 0;
char* varstart = 0;
- if (regTabPtr->m_attributes[MM].m_no_of_varsize ||
- regTabPtr->m_attributes[MM].m_no_of_dynamic)
+ if (req_struct->m_tuple_ptr->m_header_bits & Tuple_header::VAR_PART)
{
ndbassert(req_struct->is_expanded == false);
varstart = (char*)req_struct->m_var_data[MM].m_offset_array_ptr;
char* end = req_struct->m_var_data[MM].m_data_ptr;
- end = (char*)((UintPtr(end) + 3) & ~(UintPtr)3);
+ if (end != 0)
+ {
+ end = (char*)((UintPtr(end) + 3) & ~(UintPtr)3);
+ }
+ else
+ {
+ ndbassert(regTabPtr->m_attributes[MM].m_no_of_varsize == 0);
+ end = varstart; // No var size ("fixed" varsize);
+ }
Uint32 len = req_struct->m_var_data[MM].m_max_var_offset;
Uint32 dyn = 4 * req_struct->m_var_data[MM].m_dyn_part_len;
varlen = (end - varstart) + len + dyn;
varlen = (varlen + 3) & ~(Uint32)3;
+ ndbassert(varlen < 32768);
}
Uint32 totsz = fixsz + varlen;
Uint32* dst = (Uint32*)(outBuffer + ((outPos - 4) >> 2));
dst[0] = req_struct->frag_page_id;
dst[1] = operPtr.p->m_tuple_location.m_page_idx;
+ ndbassert(req_struct->m_tuple_ptr->m_data != 0);
+ ndbassert(fixsz < 8192);
memcpy(dst+2, req_struct->m_tuple_ptr->m_data, fixsz);
if (varstart)
@@ -2933,18 +2943,26 @@ Dbtup::read_lcp_keys(Uint32 tableId,
const Uint32 *src_data= src_ptr;
KeyReqStruct::Var_data* dst= &req_struct.m_var_data[MM];
- char* varstart = (char*)(((Uint16*)src_data)+mm_vars+1);
- Uint32 varlen = ((Uint16*)src_data)[mm_vars];
- Uint32* dynstart = ALIGN_WORD(varstart + varlen);
-
- dst->m_data_ptr= varstart;
- dst->m_offset_array_ptr= (Uint16*)src_data;
- dst->m_var_len_offset= 1;
- dst->m_max_var_offset= varlen;
-
- Uint32 dynlen = src_len - (dynstart - src_data);
- dst->m_dyn_data_ptr= (char*)dynstart;
- dst->m_dyn_part_len= dynlen;
+ if (mm_vars)
+ {
+ char* varstart = (char*)(((Uint16*)src_data)+mm_vars+1);
+ Uint32 varlen = ((Uint16*)src_data)[mm_vars];
+ Uint32* dynstart = ALIGN_WORD(varstart + varlen);
+
+ dst->m_data_ptr= varstart;
+ dst->m_offset_array_ptr= (Uint16*)src_data;
+ dst->m_var_len_offset= 1;
+ dst->m_max_var_offset= varlen;
+
+ Uint32 dynlen = src_len - (dynstart - src_data);
+ dst->m_dyn_data_ptr= (char*)dynstart;
+ dst->m_dyn_part_len= dynlen;
+ }
+ else
+ {
+ dst->m_dyn_data_ptr= (char*)src_data;
+ dst->m_dyn_part_len= src_len;
+ }
}
}
diff -Nrup a/storage/ndb/tools/restore/Restore.cpp b/storage/ndb/tools/restore/Restore.cpp
--- a/storage/ndb/tools/restore/Restore.cpp 2008-03-18 08:14:11 +01:00
+++ b/storage/ndb/tools/restore/Restore.cpp 2008-03-18 21:05:06 +01:00
@@ -948,12 +948,6 @@ RestoreDataIterator::readTupleData_old(U
attr_data->void_value = ptr;
attr_data->size = 4*sz;
- if(!m_hostByteOrder
- && attr_desc->m_column->getType() == NdbDictionary::Column::Timestamp)
- {
- attr_data->u_int32_value[0] = Twiddle32(attr_data->u_int32_value[0]);
- }
-
if(!Twiddle(attr_desc, attr_data))
{
return -1;
| Thread |
|---|
| • bk commit into 5.1 tree (jonas:1.2578) | jonas | 18 Mar |
