Below is the list of changes that have just been committed into a local
5.0 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-21 19:26:57+02:00, monty@stripped +18 -0
After merge fixes
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
extra/yassl/src/ssl.cpp@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +1 -1
Removed compiler warning
extra/yassl/taocrypt/src/asn.cpp@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +0 -2
After merge fixes
extra/yassl/testsuite/testsuite.cpp@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +2 -2
Removed compiler warning
mysql-test/r/ndb_lock.result@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +1 -1
After merge fixes
ndb/src/common/debugger/EventLogger.cpp@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +3 -0
Removed compiler warning
ndb/src/common/util/ConfigValues.cpp@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +0 -2
Removed compiler warning
ndb/src/common/util/NdbSqlUtil.cpp@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +0 -2
Removed compiler warning
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +0 -3
Removed compiler warning
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +0 -2
Removed compiler warning
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +0 -2
Removed compiler warning
ndb/src/kernel/vm/ndbd_malloc.cpp@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +2 -0
Removed compiler warning
ndb/src/mgmclient/main.cpp@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +0 -2
Removed compiler warning
ndb/src/ndbapi/SignalSender.cpp@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +0 -8
Removed compiler warning
sql/ha_ndbcluster.cc@stripped, 2007-02-21 19:26:55+02:00, monty@stripped +3 -0
Some extra safety
sql/item_cmpfunc.cc@stripped, 2007-02-21 19:26:56+02:00, monty@stripped +1 -1
After merge fixes
sql/item_subselect.cc@stripped, 2007-02-21 19:26:56+02:00, monty@stripped +4 -5
After merge fixes
sql/sql_insert.cc@stripped, 2007-02-21 19:26:56+02:00, monty@stripped +1 -1
After merge fixes
(This actually fixes a bug in old code when many connections are in use)
support-files/compiler_warnings.supp@stripped, 2007-02-21 19:26:56+02:00, monty@stripped +2 -10
Removed some suppressed 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.0
--- 1.235/sql/item_cmpfunc.cc 2007-02-21 14:07:05 +02:00
+++ 1.236/sql/item_cmpfunc.cc 2007-02-21 19:26:56 +02:00
@@ -904,7 +904,7 @@
*/
for (i= 0; i < ncols; i++)
{
- if (cache->el(i)->null_value)
+ if (cache->element_index(i)->null_value)
item_subs->set_cond_guard_var(i, FALSE);
}
--- 1.214/sql/sql_insert.cc 2007-02-21 13:05:02 +02:00
+++ 1.215/sql/sql_insert.cc 2007-02-21 19:26:56 +02:00
@@ -1193,7 +1193,7 @@
goto err;
}
if ((table->file->table_flags() & HA_PARTIAL_COLUMN_READ) ||
- compare_record(table, query_id))
+ compare_record(table, thd->query_id))
{
info->updated++;
--- 1.152/sql/item_subselect.cc 2007-02-21 14:07:05 +02:00
+++ 1.153/sql/item_subselect.cc 2007-02-21 19:26:56 +02:00
@@ -1164,7 +1164,7 @@
optimizer->keep_top_level_cache();
thd->lex->current_select= current;
- unit->uncacheable|= UNCACHEABLE_DEPENDENT;
+ master_unit->uncacheable|= UNCACHEABLE_DEPENDENT;
if (!abort_on_null && left_expr->maybe_null && !pushed_cond_guards)
{
@@ -1220,7 +1220,7 @@
(char *)"<list ref>")
);
Item *col_item= new Item_cond_or(item_eq, item_isnull);
- if (!abort_on_null && left_expr->el(i)->maybe_null)
+ if (!abort_on_null && left_expr->element_index(i)->maybe_null)
{
if (!(col_item= new Item_func_trig_cond(col_item, get_cond_guard(i))))
DBUG_RETURN(RES_ERROR);
@@ -1234,7 +1234,7 @@
ref_pointer_array + i,
(char *)"<no matter>",
(char *)"<list ref>"));
- if (!abort_on_null && left_expr->el(i)->maybe_null)
+ if (!abort_on_null && left_expr->element_index(i)->maybe_null)
{
if (!(item_nnull_test=
new Item_func_trig_cond(item_nnull_test, get_cond_guard(i))))
@@ -1311,7 +1311,7 @@
TODO: why we create the above for cases where the right part
cant be NULL?
*/
- if (left_expr->el(i)->maybe_null)
+ if (left_expr->element_index(i)->maybe_null)
{
if (!(item= new Item_func_trig_cond(item, get_cond_guard(i))))
DBUG_RETURN(RES_ERROR);
@@ -1762,7 +1762,6 @@
if (!executed)
{
item->reset_value_registration();
- bool have_changed_access= FALSE;
JOIN_TAB *changed_tabs[MAX_TABLES];
JOIN_TAB **last_changed_tab= changed_tabs;
if (item->have_guarded_conds())
--- 1.2/support-files/compiler_warnings.supp 2007-01-22 15:50:29 +02:00
+++ 1.3/support-files/compiler_warnings.supp 2007-02-21 19:26:56 +02:00
@@ -1,12 +1,4 @@
DictTabInfo.cpp : .*invalid access to non-static.*
DictTabInfo.cpp : .*macro was used incorrectly.*
-EventLogger.cpp : .*defined but not used.* : 916
-NdbSqlUtil.cpp : .*unused variable.* : 684 - 685
-DbdihMain.cpp : .*unused variable.* : 6666
-DbtcMain.cpp : .*unused variable.* : 6947
-DbtcMain.cpp : .*unused variable.* : 11870
-DbtupExecQuery.cpp : .*unused variable.* : 1449
-DbtupSystemRestart.cpp : .*unused variable.* : 95 - 96
-DbtupIndex.cpp : .*unused variable.* : 188 - 242
-ndbd_malloc.cpp : .*defined but not used.* : 25
-main.cpp : .*unused variable.* : 131 - 132
+DbdihMain.cpp : .*unused variable.* : 6666-6705
+DbtupExecQuery.cpp : .*unused variable.* : 1448
--- 1.13/ndb/src/common/util/ConfigValues.cpp 2007-02-21 14:07:05 +02:00
+++ 1.14/ndb/src/common/util/ConfigValues.cpp 2007-02-21 19:26:55 +02:00
@@ -18,8 +18,6 @@
#include <NdbOut.hpp>
#include <NdbTCP.h>
-static Uint32 hash(Uint32 key, Uint32 size);
-static Uint32 nextHash(Uint32 key, Uint32 size, Uint32 pos, Uint32 count);
static bool findKey(const Uint32 * vals, Uint32 sz, Uint32 key, Uint32 * pos);
/**
--- 1.30/ndb/src/common/debugger/EventLogger.cpp 2007-01-05 16:33:32 +02:00
+++ 1.31/ndb/src/common/debugger/EventLogger.cpp 2007-02-21 19:26:55 +02:00
@@ -913,6 +913,8 @@
removeAllHandlers();
}
+#ifdef NOT_USED
+
static NdbOut&
operator<<(NdbOut& out, const LogLevel & ll)
{
@@ -922,6 +924,7 @@
out << "]";
return out;
}
+#endif
int
EventLoggerBase::event_lookup(int eventType,
--- 1.34/ndb/src/common/util/NdbSqlUtil.cpp 2006-12-23 21:04:14 +02:00
+++ 1.35/ndb/src/common/util/NdbSqlUtil.cpp 2007-02-21 19:26:55 +02:00
@@ -681,8 +681,6 @@
NdbSqlUtil::cmpBit(const void* info, const void* p1, unsigned n1, const void* p2, unsigned n2, bool full)
{
Uint32 n = (n1 < n2) ? n1 : n2;
- char* c1 = (char*)p1;
- char* c2 = (char*)p2;
int ret = memcmp(p1, p2, n);
return ret;
}
--- 1.103/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2006-12-27 20:36:09 +02:00
+++ 1.104/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2007-02-21 19:26:55 +02:00
@@ -6944,7 +6944,6 @@
/*****************************************************************************/
void Dbtc::execNODE_FAILREP(Signal* signal)
{
- HostRecordPtr tmpHostptr;
jamEntry();
NodeFailRep * const nodeFail = (NodeFailRep *)&signal->theData[0];
@@ -11866,8 +11865,6 @@
}
const UintR TconnectIndex = indexOp->connectionIndex;
ApiConnectRecord * const regApiPtr = &apiConnectRecord[TconnectIndex];
- Uint32 tcKeyRequestInfo = indexOp->tcIndxReq.requestInfo;
- Uint32 commitFlg = TcKeyReq::getCommitFlag(tcKeyRequestInfo);
switch(indexOp->indexOpState) {
case(IOS_NOOP): {
--- 1.14/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp 2006-12-23 21:04:15 +02:00
+++ 1.15/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp 2007-02-21 19:26:55 +02:00
@@ -185,7 +185,6 @@
PagePtr pagePtr;
pagePtr.i = pageId;
ptrCheckGuard(pagePtr, cnoOfPage, page);
- const Uint32 tabDescriptor = tablePtr.p->tabDescriptor;
const Uint32* attrIds = &tableDescriptor[tablePtr.p->readKeyArray].tabDescr;
const Uint32 numAttrs = tablePtr.p->noOfKeyAttr;
// read pk attributes from original tuple
@@ -239,7 +238,6 @@
FragrecordPtr fragPtr;
getFragmentrec(fragPtr, fragId, tablePtr.p);
// get real page id and tuple offset
- PagePtr pagePtr;
Uint32 pageId = getRealpid(fragPtr.p, fragPageId);
ndbrequire((pageIndex & 0x1) == 0);
Uint32 pageOffset = ZPAGE_HEADER_SIZE + (pageIndex >> 1) * tablePtr.p->tupheadsize;
--- 1.7/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp 2006-12-23 21:04:15 +02:00
+++ 1.8/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp 2007-02-21 19:26:55 +02:00
@@ -92,8 +92,6 @@
seizeDiskBufferSegmentRecord(dbsiPtr);
riPtr.p->sriDataBufferSegmentP = dbsiPtr.i;
Uint32 retPageRef = RNIL;
- Uint32 noAllocPages = 1;
- Uint32 noOfPagesAllocated;
{
/**
* Use low pages for 0-pages during SR
--- 1.24/ndb/src/mgmclient/main.cpp 2006-12-23 21:04:17 +02:00
+++ 1.25/ndb/src/mgmclient/main.cpp 2007-02-21 19:26:55 +02:00
@@ -128,8 +128,6 @@
int main(int argc, char** argv){
NDB_INIT(argv[0]);
- const char *_host = 0;
- int _port = 0;
load_defaults("my",load_default_groups,&argc,&argv);
int ho_error;
--- 1.296/sql/ha_ndbcluster.cc 2007-02-21 14:07:05 +02:00
+++ 1.297/sql/ha_ndbcluster.cc 2007-02-21 19:26:55 +02:00
@@ -6660,6 +6660,9 @@
for (;;)
{
+ if (abort_loop)
+ break; /* Shutting down server */
+
pthread_mutex_lock(&LOCK_ndb_util_thread);
pthread_cond_timedwait(&COND_ndb_util_thread,
&LOCK_ndb_util_thread,
--- 1.13/mysql-test/r/ndb_lock.result 2007-01-15 11:32:36 +02:00
+++ 1.14/mysql-test/r/ndb_lock.result 2007-02-21 19:26:55 +02:00
@@ -121,7 +121,7 @@
x y z
1 one 1
select * from t1 where x = 2 for update;
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+Got one of the listed errors
rollback;
commit;
begin;
--- 1.6/extra/yassl/testsuite/testsuite.cpp 2007-02-21 13:04:55 +02:00
+++ 1.7/extra/yassl/testsuite/testsuite.cpp 2007-02-21 19:26:55 +02:00
@@ -86,8 +86,8 @@
// input output compare
byte input[TaoCrypt::MD5::DIGEST_SIZE];
byte output[TaoCrypt::MD5::DIGEST_SIZE];
- file_test("input", input);
- file_test("output", output);
+ file_test((char*) "input", input);
+ file_test((char*) "output", output);
assert(memcmp(input, output, sizeof(input)) == 0);
printf("\nAll tests passed!\n");
--- 1.24/extra/yassl/src/ssl.cpp 2007-01-25 20:34:38 +02:00
+++ 1.25/extra/yassl/src/ssl.cpp 2007-02-21 19:26:55 +02:00
@@ -950,7 +950,7 @@
char* ERR_error_string(unsigned long errNumber, char* buffer)
{
- static char* msg = "Please supply a buffer for error string";
+ static char* msg = (char*) "Please supply a buffer for error string";
if (buffer) {
SetErrorString(YasslError(errNumber), buffer);
--- 1.13/extra/yassl/taocrypt/src/asn.cpp 2007-02-21 14:07:05 +02:00
+++ 1.14/extra/yassl/taocrypt/src/asn.cpp 2007-02-21 19:26:55 +02:00
@@ -747,8 +747,6 @@
idx += length2;
}
- source_.advance(oidSz + 1);
- word32 length2 = GetLength(source_);
source_.advance(length2);
}
}
--- 1.2/ndb/src/kernel/vm/ndbd_malloc.cpp 2006-12-23 21:04:17 +02:00
+++ 1.3/ndb/src/kernel/vm/ndbd_malloc.cpp 2007-02-21 19:26:55 +02:00
@@ -22,12 +22,14 @@
#include <stdio.h>
#endif
+#ifdef TRACE_MALLOC
static void xxx(size_t size, size_t *s_m, size_t *s_k, size_t *s_b)
{
*s_m = size/1024/1024;
*s_k = (size - *s_m*1024*1024)/1024;
*s_b = size - *s_m*1024*1024-*s_k*1024;
}
+#endif
static Uint64 g_allocated_memory;
void *ndbd_malloc(size_t size)
--- 1.10/ndb/src/ndbapi/SignalSender.cpp 2007-02-21 13:04:58 +02:00
+++ 1.11/ndb/src/ndbapi/SignalSender.cpp 2007-02-21 19:26:55 +02:00
@@ -19,14 +19,6 @@
#include <signaldata/NFCompleteRep.hpp>
#include <signaldata/NodeFailRep.hpp>
-static
-void
-require(bool x)
-{
- if (!x)
- abort();
-}
-
SimpleSignal::SimpleSignal(bool dealloc){
memset(this, 0, sizeof(* this));
deallocSections = dealloc;
| Thread |
|---|
| • bk commit into 5.0 tree (monty:1.2419) | monty | 21 Feb |
