Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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, 2007-02-22 16:35:31+02:00, monty@stripped +22 -0
Fixed compiler warnings
sql/sql_connect.cc@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +8 -8
Move setting of connect_timeout to better place
storage/archive/archive_test.c@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +6 -6
Fixed compiler warnings
storage/archive/azio.c@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +4 -2
Fixed compiler warnings
storage/ndb/src/cw/cpcd/CPCD.hpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +1 -0
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +1 -0
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +0 -1
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +2 -9
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +1 -0
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +1 -4
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +3 -0
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +1 -6
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +0 -3
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +4 -5
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +2 -5
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +0 -1
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +0 -1
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +1 -2
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +2 -0
Fixed compiler warnings
storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +0 -1
Fixed compiler warnings
storage/ndb/src/kernel/blocks/diskpage.hpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +3 -0
Fixed compiler warnings
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp@stripped, 2007-02-22 16:35:28+02:00, monty@stripped +1 -0
Fixed compiler warnings
support-files/compiler_warnings.supp@stripped, 2007-02-22 16:35:29+02:00, monty@stripped +5 -0
Fixed compiler warnings
# 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: monty
# Host: narttu.mysql.fi
# Root: /home/my/mysql-5.1
--- 1.10/storage/archive/archive_test.c 2007-01-24 20:30:03 +02:00
+++ 1.11/storage/archive/archive_test.c 2007-02-22 16:35:28 +02:00
@@ -36,9 +36,9 @@
char test_string[BUFFER_LEN];
-#define TWOGIG 2147483648
-#define FOURGIG 4294967296
-#define EIGHTGIG 8589934592
+#define TWOGIG LL(2147483648)
+#define FOURGIG LL(4294967296)
+#define EIGHTGIG LL(8589934592)
/* prototypes */
int size_test(unsigned long long length, unsigned long long rows_to_test_for);
@@ -222,9 +222,9 @@
/* Start size tests */
printf("About to run 2/4/8 gig tests now, you may want to hit CTRL-C\n");
- size_test(TWOGIG, 2097152);
- size_test(FOURGIG, 4194304);
- size_test(EIGHTGIG, 8388608);
+ size_test(TWOGIG, 2097152L);
+ size_test(FOURGIG, 4194304L);
+ size_test(EIGHTGIG, 8388608L);
return 0;
}
--- 1.15/storage/archive/azio.c 2007-01-24 20:30:03 +02:00
+++ 1.16/storage/archive/azio.c 2007-02-22 16:35:28 +02:00
@@ -140,7 +140,8 @@
else if (s->mode == 'w')
{
unsigned char buffer[AZHEADER_SIZE + AZMETA_BUFFER_SIZE];
- my_pread(s->file, buffer, AZHEADER_SIZE + AZMETA_BUFFER_SIZE, 0, MYF(0));
+ my_pread(s->file, (byte*) buffer, AZHEADER_SIZE + AZMETA_BUFFER_SIZE, 0,
+ MYF(0));
read_header(s, buffer); /* skip the .az header */
my_seek(s->file, 0, MY_SEEK_END, MYF(0));
}
@@ -609,7 +610,8 @@
if (s->mode == 'r')
{
unsigned char buffer[AZHEADER_SIZE + AZMETA_BUFFER_SIZE];
- my_pread(s->file, buffer, AZHEADER_SIZE + AZMETA_BUFFER_SIZE, 0, MYF(0));
+ my_pread(s->file, (byte*) buffer, AZHEADER_SIZE + AZMETA_BUFFER_SIZE, 0,
+ MYF(0));
read_header(s, buffer); /* skip the .az header */
return Z_OK;
--- 1.6/support-files/compiler_warnings.supp 2007-02-22 11:40:12 +02:00
+++ 1.7/support-files/compiler_warnings.supp 2007-02-22 16:35:29 +02:00
@@ -1,3 +1,4 @@
+integer.cpp: .*control reaches end of non-void function.*: 1288-1427
DictTabInfo.cpp : .*invalid access to non-static.*
DictTabInfo.cpp : .*macro was used incorrectly.*
DbdihMain.cpp : .*unused variable.* : 6666-6705
@@ -7,3 +8,7 @@
diskpage.hpp: .*only defines private constructors and has no friends.*
tuppage.hpp: .*only defines private constructors and has no friends.*
NdbScanOperation.cpp: .*unused variable '__align'.* : 1190-1200
+sql_yacc.cc : .*label 'yyerrlab1' defined but not used.*
+kernel_types.h : .*'struct Local_key' only defines private constructors and has no friends.*
+lgman.hpp : .*'struct Lgman::Buffer_idx' only defines private constructors and has no friends.*
+SchemaFile.hpp : .*'struct SchemaFile::TableEntry' only defines private constructors and has no friends.*
--- 1.21/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp 2007-01-15 22:05:11 +02:00
+++ 1.22/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp 2007-02-22 16:35:28 +02:00
@@ -153,12 +153,10 @@
return;
Uint32 min_size= 4*tabPtrP->m_offsets[DD].m_fix_header_size;
- Uint32 var_size= tabPtrP->m_offsets[DD].m_max_var_offset;
if (tabPtrP->m_attributes[DD].m_no_of_varsize == 0)
{
Uint32 recs_per_page= (4*Tup_fixsize_page::DATA_WORDS)/min_size;
- Uint32 pct_free= 0;
m_page_free_bits_map[0] = recs_per_page; // 100% free
m_page_free_bits_map[1] = 1;
m_page_free_bits_map[2] = 0;
@@ -317,7 +315,7 @@
0, 0, 0);
unsigned uncommitted, committed;
uncommitted = committed = ~(unsigned)0;
- int ret = tsman.get_page_free_bits(&page, &uncommitted, &committed);
+ (void) tsman.get_page_free_bits(&page, &uncommitted, &committed);
idx = alloc.calc_page_free_bits(real_free);
ddassert(idx == committed);
@@ -858,9 +856,6 @@
if (DBG_DISK)
ndbout << " disk_page_set_dirty " << key << endl;
-
- Uint32 tableId = pagePtr.p->m_table_id;
- Uint32 fragId = pagePtr.p->m_fragment_id;
Ptr<Tablerec> tabPtr;
tabPtr.i= pagePtr.p->m_table_id;
--- 1.5/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp 2006-12-23 21:33:30 +02:00
+++ 1.6/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp 2007-02-22 16:35:28 +02:00
@@ -163,7 +163,6 @@
/**
* TODO free fix + var part
*/
- Uint32 page_idx= key->m_page_idx;
Uint32 *ptr = ((Fix_page*)pagePtr.p)->get_ptr(key->m_page_idx, 0);
Tuple_header* tuple = (Tuple_header*)ptr;
--- 1.3/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp 2006-12-23 21:33:30 +02:00
+++ 1.4/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp 2007-02-22 16:35:28 +02:00
@@ -461,9 +461,8 @@
<< " free: " << page.free_space;
out << " free list: " << hex << page.next_free_index << " " << flush;
- Uint32 startTuple = page.next_free_index >> 16;
-
#if 0
+ Uint32 startTuple = page.next_free_index >> 16;
Uint32 cnt = 0;
Uint32 next= startTuple;
while((next & 0xFFFF) != 0xFFFF)
--- 1.4/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp 2006-12-23 21:33:30 +02:00
+++ 1.5/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp 2007-02-22 16:35:28 +02:00
@@ -94,6 +94,7 @@
* Alloc record from page
* return page_idx
**/
+ Tup_fixsize_page() {}
Uint32 alloc_record();
Uint32 alloc_record(Uint32 page_idx);
Uint32 free_record(Uint32 page_idx);
@@ -148,6 +149,7 @@
Uint32 m_data[DATA_WORDS];
+ Tup_varsize_page() {}
void init();
Uint32* get_free_space_ptr() {
--- 1.4/storage/ndb/src/kernel/blocks/diskpage.hpp 2006-12-31 02:04:56 +02:00
+++ 1.5/storage/ndb/src/kernel/blocks/diskpage.hpp 2007-02-22 16:35:28 +02:00
@@ -54,6 +54,7 @@
Uint32 m_node_id;
Uint32 m_file_type;
Uint32 m_time; // time(0)
+ Zero_page_header() {}
void init(File_type ft, Uint32 node_id, Uint32 version, Uint32 now);
int validate(File_type ft, Uint32 node_id, Uint32 version, Uint32 now);
};
@@ -86,6 +87,7 @@
Uint32 m_fragment_id;
Uint32 m_next_free_extent;
};
+ Extent_header() {}
Uint32 m_page_bitmask[1]; // (BitsPerPage*ExtentSize)/(32*PageSize)
Uint32 get_free_bits(Uint32 page) const;
Uint32 get_free_word_offset(Uint32 page) const;
@@ -102,6 +104,7 @@
struct Page_header m_page_header;
Extent_header m_extents[1];
+ Extent_page() {}
Extent_header* get_header(Uint32 extent_no, Uint32 extent_size);
};
--- 1.12/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp 2007-01-29 16:13:14 +02:00
+++ 1.13/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp 2007-02-22 16:35:28 +02:00
@@ -220,6 +220,7 @@
while (cnt < MAX_CHUNKS && allocated < pages)
{
InitChunk chunk;
+ LINT_INIT(chunk.m_start);
#if defined(_lint) || defined(FORCE_INIT_OF_VARS)
memset((char*) &chunk, 0 , sizeof(chunk));
--- 1.6/storage/ndb/src/cw/cpcd/CPCD.hpp 2006-12-23 21:20:14 +02:00
+++ 1.7/storage/ndb/src/cw/cpcd/CPCD.hpp 2007-02-22 16:35:28 +02:00
@@ -62,6 +62,7 @@
struct EventSubscriber {
virtual void report(const CPCEvent &) = 0;
+ EventSubscriber() {}
virtual ~EventSubscriber() {}
};
--- 1.35/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp 2007-02-14 07:35:28 +02:00
+++ 1.36/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp 2007-02-22 16:35:28 +02:00
@@ -537,6 +537,7 @@
,OP_INITIAL = ~(Uint32)0
};
+ Operationrec() {}
bool is_same_trans(const Operationrec* op) const {
return
transId1 == op->transId1 && transId2 == op->transId2;
--- 1.82/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp 2007-02-14 07:35:28 +02:00
+++ 1.83/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp 2007-02-22 16:35:28 +02:00
@@ -698,7 +698,6 @@
void Dbacc::releaseRootFragResources(Signal* signal, Uint32 tableId)
{
- FragmentrecPtr rootPtr;
TabrecPtr tabPtr;
tabPtr.i = tableId;
ptrCheckGuard(tabPtr, ctablesize, tabrec);
--- 1.114/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2007-01-27 03:46:41 +02:00
+++ 1.115/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2007-02-22 16:35:28 +02:00
@@ -291,7 +291,6 @@
for(; ok; ok = c_obj_hash.next(iter))
{
Rope name(c_rope_pool, iter.curr.p->m_name);
- const Uint32 size = name.size();
char buf[1024];
name.copy(buf);
ndbout_c("%s m_ref_count: %d", buf, iter.curr.p->m_ref_count);
@@ -3793,7 +3792,7 @@
createTabPtr.p->m_dihAddFragPtr = RNIL;
Uint32 key = c_opRecordSequence + 1;
- Uint32 *theData = signal->getDataPtrSend(), i;
+ Uint32 *theData = signal->getDataPtrSend();
Uint16 *frag_data= (Uint16*)&signal->theData[25];
CreateFragmentationReq * const req = (CreateFragmentationReq*)theData;
req->senderRef = reference();
@@ -4940,7 +4939,6 @@
packTableIntoPages(w, tabPtr);
SegmentedSectionPtr spDataPtr;
- Ptr<SectionSegment> tmpTsPtr;
w.getPtr(spDataPtr);
signal->setSection(spDataPtr, CreateTabReq::DICT_TAB_INFO);
@@ -5425,7 +5423,6 @@
Uint32 fragCount = req->totalFragments;
Uint32 requestInfo = req->requestInfo;
Uint32 startGci = req->startGci;
- Uint32 tablespace_id= req->tablespaceId;
Uint32 logPart = req->logPartId;
ndbrequire(node == getOwnNodeId());
@@ -7538,7 +7535,6 @@
Dbdict::execLIST_TABLES_REQ(Signal* signal)
{
jamEntry();
- Uint32 i;
ListTablesReq * req = (ListTablesReq*)signal->getDataPtr();
Uint32 senderRef = req->senderRef;
Uint32 senderData = req->senderData;
@@ -9415,7 +9411,6 @@
evntRecPtr.i = ref->getSenderData();
ndbrequire((evntRecPtr.p = c_opCreateEvent.getPtr(evntRecPtr.i)) != NULL);
- Uint32 err;
interpretUtilPrepareErrorCode(errorCode, evntRecPtr.p->m_errorCode,
evntRecPtr.p->m_errorLine);
evntRecPtr.p->m_errorNode = reference();
@@ -15184,7 +15179,6 @@
const Uint32 objId = req->objId;
const Uint32 objVersion = req->objVersion;
const Uint32 objType = req->objType;
- const Uint32 requestInfo = req->requestInfo;
DropObjRecordPtr dropObjPtr;
ndbrequire(c_opDropObj.seize(dropObjPtr));
@@ -15683,8 +15677,7 @@
void
Dbdict::create_fg_abort_start(Signal* signal, SchemaOp* op){
- CreateFilegroupImplReq* req =
- (CreateFilegroupImplReq*)signal->getDataPtrSend();
+ (void) signal->getDataPtrSend();
if (op->m_obj_ptr_i != RNIL)
{
--- 1.47/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp 2007-01-27 03:46:41 +02:00
+++ 1.48/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp 2007-02-22 16:35:28 +02:00
@@ -1975,6 +1975,7 @@
NodeBitmask m_nodes;
Uint32 m_errorCode;
+ SchemaTransaction() {}
void setErrorCode(Uint32 c){ if(m_errorCode == 0) m_errorCode = c;}
/**
--- 1.138/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2007-02-21 16:45:06 +02:00
+++ 1.139/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2007-02-22 16:35:28 +02:00
@@ -599,7 +599,7 @@
case DefineBackupRef::FailedInsertTableList:
jam();
err_code = NDBD_EXIT_INVALID_CONFIG;
- extra_msg = "Probably Backup parameters configuration error, Please consult the manual";
+ extra_msg = (char*) "Probably Backup parameters configuration error, Please consult the manual";
progError(__LINE__, err_code, extra_msg);
}
@@ -3963,7 +3963,6 @@
Dblqh::handle_nr_copy(Signal* signal, Ptr<TcConnectionrec> regTcPtr)
{
jam();
- Uint32 tableId = regTcPtr.p->tableref;
Uint32 fragPtr = fragptr.p->tupFragptr;
Uint32 op = regTcPtr.p->operation;
@@ -6728,7 +6727,6 @@
}//if
TcConnectionrec * const regTcPtr = tcConnectptr.p;
- Uint32 activeCreat = regTcPtr->activeCreat;
if (ERROR_INSERTED(5100))
{
SET_ERROR_INSERT_VALUE(5101);
@@ -6808,7 +6806,6 @@
return;
}//if
TcConnectionrec * const regTcPtr = tcConnectptr.p;
- Uint32 activeCreat = regTcPtr->activeCreat;
if (regTcPtr->transactionState != TcConnectionrec::PREPARED) {
warningReport(signal, 10);
return;
--- 1.58/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp 2007-02-14 07:35:29 +02:00
+++ 1.59/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp 2007-02-22 16:35:28 +02:00
@@ -516,6 +516,7 @@
return (m_key.m_file_no << 16) ^ m_key.m_page_idx;
}
+ Extent_info() {}
bool equal(const Extent_info & rec) const {
return m_key.m_file_no == rec.m_key.m_file_no &&
m_key.m_page_idx == rec.m_key.m_page_idx;
@@ -667,6 +668,7 @@
Uint32 currentAttrinbufLen; //Used until copyAttrinfo
};
+ Operationrec() {}
bool is_first_operation() const { return prevActiveOp == RNIL;}
bool is_last_operation() const { return nextActiveOp == RNIL;}
@@ -1241,6 +1243,7 @@
STATIC_CONST( LCP_KEEP = 0x02000000 ); // Should be returned in LCP
STATIC_CONST( FREE = 0x02800000 ); // Is free
+ Tuple_header() {}
Uint32 get_tuple_version() const {
return m_header_bits & TUP_VERSION_MASK;
}
--- 1.52/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp 2007-02-06 04:54:22 +02:00
+++ 1.53/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp 2007-02-22 16:35:28 +02:00
@@ -451,7 +451,6 @@
Tuple_header* ptr= (Tuple_header*)tmp;
int res= 1;
- Uint32 opPtr= ptr->m_operation_ptr_i;
if(ptr->m_header_bits & Tuple_header::DISK_PART)
{
Page_cache_client::Request req;
@@ -536,7 +535,6 @@
Tuple_header* ptr= (Tuple_header*)tmp;
int res= 1;
- Uint32 opPtr= ptr->m_operation_ptr_i;
if(ptr->m_header_bits & Tuple_header::DISK_PART)
{
Page_cache_client::Request req;
@@ -2923,7 +2921,6 @@
ptrCheckGuard(tablePtr, cnoOfTablerec, tablerec);
Local_key tmp = *key;
- Uint32 pages = fragPtr.p->noOfPages;
int ret;
PagePtr page_ptr;
--- 1.33/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp 2006-12-27 11:58:04 +02:00
+++ 1.34/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp 2007-02-22 16:35:28 +02:00
@@ -53,7 +53,6 @@
regTabPtr.i = tupFragReq->tableId;
Uint32 noOfAttributes = tupFragReq->noOfAttr;
Uint32 fragId = tupFragReq->fragId;
- Uint32 noOfNullAttr = tupFragReq->noOfNullAttr;
/* Uint32 schemaVersion = tupFragReq->schemaVersion;*/
Uint32 noOfKeyAttr = tupFragReq->noOfKeyAttr;
Uint32 noOfCharsets = tupFragReq->noOfCharsets;
@@ -594,8 +593,8 @@
Uint32 sz= sizeof(Disk_undo::Create) >> 2;
Logfile_client lgman(this, c_lgman, regFragPtr.p->m_logfile_group_id);
- int r0 = c_lgman->alloc_log_space(regFragPtr.p->m_logfile_group_id,
- sz);
+ (void) c_lgman->alloc_log_space(regFragPtr.p->m_logfile_group_id,
+ sz);
int res= lgman.get_log_buffer(signal, sz, &cb);
switch(res){
@@ -951,7 +950,7 @@
cb.m_callbackFunction =
safe_cast(&Dbtup::drop_table_log_buffer_callback);
Uint32 sz= sizeof(Disk_undo::Drop) >> 2;
- int r0 = c_lgman->alloc_log_space(logfile_group_id, sz);
+ (void) c_lgman->alloc_log_space(logfile_group_id, sz);
Logfile_client lgman(this, c_lgman, logfile_group_id);
int res= lgman.get_log_buffer(signal, sz, &cb);
@@ -1081,7 +1080,7 @@
safe_cast(&Dbtup::drop_fragment_free_extent_log_buffer_callback);
#if NOT_YET_UNDO_FREE_EXTENT
Uint32 sz= sizeof(Disk_undo::FreeExtent) >> 2;
- int r0 = c_lgman->alloc_log_space(fragPtr.p->m_logfile_group_id, sz);
+ (void) c_lgman->alloc_log_space(fragPtr.p->m_logfile_group_id, sz);
Logfile_client lgman(this, c_lgman, fragPtr.p->m_logfile_group_id);
--- 1.32/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp 2006-12-27 11:58:04 +02:00
+++ 1.33/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp 2007-02-22 16:35:28 +02:00
@@ -341,7 +341,6 @@
Uint32 maxIndexBuf = indexBuf + (dstLen >> 2);
if (maxIndexBuf <= maxRead && ok) {
ljam();
- const char* ssrcPtr = (const char*)srcPtr;
int n = NdbSqlUtil::strnxfrm_bug7284(cs, dstPtr, dstLen, srcPtr + lb, len);
ndbrequire(n != -1);
int m = n;
@@ -510,7 +509,6 @@
Uint32 maxIndexBuf = index_buf + (dstLen >> 2);
if (maxIndexBuf <= max_read && ok) {
ljam();
- const char* ssrcPtr = (const char*)srcPtr;
int n = NdbSqlUtil::strnxfrm_bug7284(cs, dstPtr, dstLen, srcPtr + lb, len);
ndbrequire(n != -1);
int m = n;
@@ -618,7 +616,6 @@
Uint32 maxIndexBuf = indexBuf + (dstLen >> 2);
if (maxIndexBuf <= maxRead && ok) {
ljam();
- const char* ssrcPtr = (const char*)srcPtr;
int n = NdbSqlUtil::strnxfrm_bug7284(cs, dstPtr, dstLen, srcPtr + lb, len);
ndbrequire(n != -1);
int m = n;
@@ -1025,7 +1022,7 @@
Uint32 attr_des2)
{
Uint32 attr_descriptor, index_buf, in_buf_len, var_index, null_ind;
- Uint32 vsize_in_bytes, vsize_in_words, new_index, max_var_size;
+ Uint32 vsize_in_words, new_index, max_var_size;
Uint32 var_attr_pos;
char *var_data_start;
Uint16 *vpos_array;
@@ -1445,7 +1442,7 @@
Uint32 attr_des2)
{
Uint32 attr_descriptor, index_buf, in_buf_len, var_index, null_ind;
- Uint32 vsize_in_bytes, vsize_in_words, new_index, max_var_size;
+ Uint32 vsize_in_words, new_index, max_var_size;
Uint32 var_attr_pos;
char *var_data_start;
Uint16 *vpos_array;
--- 1.1/sql/sql_connect.cc 2007-02-22 10:50:31 +02:00
+++ 1.2/sql/sql_connect.cc 2007-02-22 16:35:28 +02:00
@@ -933,6 +933,11 @@
thd->thread_id));
net->no_send_error= 0;
+
+ /* Use "connect_timeout" value during connection phase */
+ net_set_read_timeout(net, connect_timeout);
+ net_set_write_timeout(net, connect_timeout);
+
if ((error=check_connection(thd)))
{ // Wrong permissions
if (error > 0)
@@ -944,6 +949,9 @@
statistic_increment(aborted_connects,&LOCK_status);
DBUG_RETURN(1);
}
+ /* Connect completed, set read/write timeouts back to default */
+ net_set_read_timeout(net, thd->variables.net_read_timeout);
+ net_set_write_timeout(net, thd->variables.net_write_timeout);
DBUG_RETURN(0);
}
@@ -1069,18 +1077,10 @@
{
NET *net= &thd->net;
- /* Use "connect_timeout" value during connection phase */
- net_set_read_timeout(net, connect_timeout);
- net_set_write_timeout(net, connect_timeout);
-
if (login_connection(thd))
goto end_thread;
prepare_new_connection_state(thd);
-
- /* Connect completed, set read/write timeouts back to default */
- net_set_read_timeout(net, thd->variables.net_read_timeout);
- net_set_write_timeout(net, thd->variables.net_write_timeout);
while (!net->error && net->vio != 0 &&
!(thd->killed == THD::KILL_CONNECTION))
--- 1.19/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp 2007-01-24 19:57:03 +02:00
+++ 1.20/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp 2007-02-22 16:35:28 +02:00
@@ -831,7 +831,6 @@
{
ndbassert(bits & ScanOp::SCAN_NR);
Local_key& key_mm = pos.m_key_mm;
- Fix_page* page = (Fix_page*)pos.m_page;
if (! (bits & ScanOp::SCAN_DD)) {
key_mm = pos.m_key;
// caller has already set pos.m_get to next tuple
--- 1.2/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp 2006-12-23 21:33:30 +02:00
+++ 1.3/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp 2007-02-22 16:35:28 +02:00
@@ -51,7 +51,6 @@
TreePos pos1 = scan.m_scanPos;
TreePos pos2;
{ // as in scanFirst()
- TreeHead& tree = frag.m_tree;
setKeyAttrs(frag);
const unsigned idir = 1;
const ScanBound& bound = *scan.m_bound[idir];
| Thread |
|---|
| • bk commit into 5.1 tree (monty:1.2452) | monty | 22 Feb |
