Below is the list of changes that have just been committed into a local
5.1-falcon repository of . When 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-04-10 16:19:30-04:00, jas@rowvwade. +8 -0
Eliminate compiler warnings.
storage/falcon/Index.cpp@stripped, 2007-04-10 16:19:21-04:00, jas@rowvwade. +3 -2
Eliminate compiler warnings.
storage/falcon/Index.h@stripped, 2007-04-10 16:19:21-04:00, jas@rowvwade. +1 -1
Eliminate compiler warnings.
storage/falcon/Index2Page.cpp@stripped, 2007-04-10 16:19:22-04:00, jas@rowvwade. +1 -1
Eliminate compiler warnings.
storage/falcon/Index2RootPage.cpp@stripped, 2007-04-10 16:19:22-04:00, jas@rowvwade. +2 -2
Eliminate compiler warnings.
storage/falcon/IndexRootPage.cpp@stripped, 2007-04-10 16:19:22-04:00, jas@rowvwade. +4 -2
Eliminate compiler warnings.
storage/falcon/SRLUpdateRecords.cpp@stripped, 2007-04-10 16:19:23-04:00, jas@rowvwade. +4 -1
Eliminate compiler warnings.
storage/falcon/SRLUpdateRecords.h@stripped, 2007-04-10 16:19:23-04:00, jas@rowvwade. +1 -1
Eliminate compiler warnings.
storage/falcon/Transaction.cpp@stripped, 2007-04-10 16:19:23-04:00, jas@rowvwade. +2 -1
Eliminate 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: jas
# Host: rowvwade.
# Root: D:/MySQL/mysql-5.1-falcon
--- 1.22/storage/falcon/SRLUpdateRecords.cpp 2007-04-10 16:19:50 -04:00
+++ 1.23/storage/falcon/SRLUpdateRecords.cpp 2007-04-10 16:19:50 -04:00
@@ -36,16 +36,19 @@
{
}
-void SRLUpdateRecords::chill(Transaction *transaction, RecordVersion *record, int dataLength)
+void SRLUpdateRecords::chill(Transaction *transaction, RecordVersion *record, uint dataLength)
{
// Record data has been written to the serial log, so release the data
// buffer and set the state accordingly
+
record->deleteData();
record->state = recChilled;
// Update transaction counter and chillPoint
+
transaction->chillPoint = &record->next;
ASSERT(transaction->totalRecordData >= dataLength);
+
if (transaction->totalRecordData >= dataLength)
transaction->totalRecordData -= dataLength;
}
--- 1.3/storage/falcon/SRLUpdateRecords.h 2007-04-10 16:19:50 -04:00
+++ 1.4/storage/falcon/SRLUpdateRecords.h 2007-04-10 16:19:50 -04:00
@@ -34,7 +34,7 @@
virtual void read(void);
virtual void pass2(void);
void append(Transaction *transaction, RecordVersion *records, bool chillRecords = false);
- void chill(Transaction *transaction, RecordVersion *record, int dataLength);
+ void chill(Transaction *transaction, RecordVersion *record, uint dataLength);
int thaw(RecordVersion *record);
const UCHAR *data;
--- 1.12/storage/falcon/Index2Page.cpp 2007-04-10 16:19:50 -04:00
+++ 1.13/storage/falcon/Index2Page.cpp 2007-04-10 16:19:50 -04:00
@@ -74,7 +74,7 @@
int offset1 = computePrefix (&priorKey, indexKey);
int length1 = indexKey->keyLength - offset1;
int delta = Index2Node::nodeLength(offset1, length1, recordNumber);
- int32 nextNumber;
+ int32 nextNumber = 0;
int offset2;
if ((UCHAR*) node.node == (UCHAR*) this + length)
--- 1.12/storage/falcon/Index2RootPage.cpp 2007-04-10 16:19:50 -04:00
+++ 1.13/storage/falcon/Index2RootPage.cpp 2007-04-10 16:19:50 -04:00
@@ -62,7 +62,7 @@
{
int sequence = -1;
Bdb *sectionsBuffer = NULL;
- SectionPage *sections;
+ SectionPage *sections = NULL;
int skipped = 0;
for (int32 id = dbb->nextIndex;; ++id)
@@ -324,7 +324,7 @@
void Index2RootPage::scanIndex(Dbb * dbb, int32 indexId, int32 rootPage, IndexKey* lowKey, IndexKey* highKey, bool partial, TransId transId, Bitmap *bitmap)
{
IndexKey key;
- uint offset;
+ uint offset = 0;
if (dbb->debug & (DEBUG_KEYS | DEBUG_SCAN_INDEX))
{
--- 1.40/storage/falcon/Index.cpp 2007-04-10 16:19:50 -04:00
+++ 1.41/storage/falcon/Index.cpp 2007-04-10 16:19:50 -04:00
@@ -327,7 +327,7 @@
return;
}
- int p = 0, q = 0;
+ uint p = 0, q = 0;
int n;
UCHAR *key = indexKey->key;
@@ -350,6 +350,7 @@
q = (length + RUN - 1) / (RUN - 1) * RUN;
else
q = (length * RUN / (RUN - 1)) + (length % (RUN -1));
+
if (p + q > MAX_INDEX_KEY_RUN_LENGTH)
throw SQLError (INDEX_OVERFLOW, "maximum index key length exceeded");
@@ -721,7 +722,7 @@
return partialLengths[segment];
}
-void Index::setPartialLength(int segment, int partialLength)
+void Index::setPartialLength(int segment, uint partialLength)
{
if (partialLength > MAX_INDEX_KEY_LENGTH)
partialLength = MAX_INDEX_KEY_LENGTH;
--- 1.16/storage/falcon/Index.h 2007-04-10 16:19:50 -04:00
+++ 1.17/storage/falcon/Index.h 2007-04-10 16:19:50 -04:00
@@ -93,7 +93,7 @@
void addField (Field *field, int position);
void rename(const char* newName);
int getPartialLength(int segment);
- void setPartialLength(int segment, int partialLength);
+ void setPartialLength(int segment, uint partialLength);
UCHAR getPadByte(int index);
void checkMaxKeyLength(void);
--- 1.60/storage/falcon/IndexRootPage.cpp 2007-04-10 16:19:50 -04:00
+++ 1.61/storage/falcon/IndexRootPage.cpp 2007-04-10 16:19:50 -04:00
@@ -342,7 +342,7 @@
void IndexRootPage::scanIndex(Dbb * dbb, int32 indexId, int32 rootPage, IndexKey* lowKey, IndexKey* highKey, bool partial, TransId transId, Bitmap *bitmap)
{
IndexKey key;
- uint offset;
+ uint offset = 0;
if (dbb->debug & (DEBUG_KEYS | DEBUG_SCAN_INDEX))
{
@@ -363,8 +363,10 @@
throw SQLError (RUNTIME_ERROR, "can't find index %d", indexId);
IndexPage *page = (IndexPage*) bdb->buffer;
+
if (dbb->debug & (DEBUG_PAGES | DEBUG_SCAN_INDEX))
page->printPage (bdb, false);
+
IndexNode node (page->findNodeInLeaf (lowKey, &key));
Btn *end = (Btn*) ((UCHAR*) page + page->length);
UCHAR *endKey = (highKey) ? highKey->key + highKey->keyLength : 0;
@@ -921,7 +923,7 @@
int offset1 = IndexPage::computePrefix (&priorKey, &key);
int length1 = key.keyLength - offset1;
int delta = IndexNode::nodeLength(offset1, length1, recordNumber);
- int32 nextNumber;
+ int32 nextNumber = 0;
int offset2;
if ((UCHAR*) node.node == (UCHAR*) page + page->length)
--- 1.67/storage/falcon/Transaction.cpp 2007-04-10 16:19:50 -04:00
+++ 1.68/storage/falcon/Transaction.cpp 2007-04-10 16:19:50 -04:00
@@ -88,7 +88,8 @@
if (seq == 0)
{
state = Available;
-
+ systemTransaction = false;
+
return;
}
| Thread |
|---|
| • bk commit into 5.1-falcon tree (jas:1.2575) | U-ROWVWADEjas | 10 Apr |
