summaryrefslogtreecommitdiff
path: root/dbug
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-02-23 02:06:58 +0200
committerMichael Widenius <monty@askmonty.org>2011-02-23 02:06:58 +0200
commit39616eb9ef974c69e73bcb80cd7e3c40228910fd (patch)
tree092aec15bb2404ab11a594dae191d07a4bae2298 /dbug
parentab6d450639ce8b031929080be579148264989aa5 (diff)
downloadmariadb-git-39616eb9ef974c69e73bcb80cd7e3c40228910fd.tar.gz
Fixed compiler warnings and some test failures found by buildbot
dbug/dbug.c: Fixed compiler warnings on windows mysql-test/r/index_intersect_innodb.result: Don't print number of rows as this varies mysql-test/suite/funcs_1/r/processlist_val_no_prot.result: Update to use new State mysql-test/suite/handler/heap.result: Update results mysql-test/suite/handler/heap.test: Changed key used in test as the key 'b' will not guarantee order of the two last elements (as the key value is the same) mysql-test/suite/pbxt/r/lock_multi.result: Update to use new State mysql-test/t/index_intersect.test: Don't print number of rows as this varies mysql-test/valgrind.supp: Added suppression for linux mysys/hash.c: Fixed compiler warnings on windows plugin/handler_socket/handlersocket/database.cpp: Fixed compiler warnings sql-common/client_plugin.c: Changed variable to define to avoid compiler warnings when variable is not used sql-common/my_time.c: Initialize all my_time elements to avoid compiler warnings storage/oqgraph/ha_oqgraph.cc: Use right function (to avoid compiler warning) storage/pbxt/src/table_xt.cc: Initialize variables (to avoid compiler warnings)
Diffstat (limited to 'dbug')
-rw-r--r--dbug/dbug.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c
index 490c91cbf0f..afed84a1c01 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -1481,7 +1481,7 @@ next:
subdir=0;
while (ctlp < end && *ctlp != ',')
ctlp++;
- len=ctlp-start;
+ len= (int) (ctlp-start);
if (start[len-1] == '/')
{
len--;
@@ -1544,7 +1544,7 @@ static struct link *ListCopy(struct link *orig)
{
struct link *new_malloc;
struct link *head;
- int len;
+ size_t len;
head= NULL;
while (orig != NULL)
@@ -1999,7 +1999,7 @@ static void DBUGOpenFile(CODE_STATE *cs,
{
if (end)
{
- int len=end-name;
+ int len= (int) (end-name);
memcpy(cs->stack->name, name, len);
cs->stack->name[len]=0;
}