summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-04-01 12:04:26 +0300
committerMichael Widenius <monty@askmonty.org>2010-04-01 12:04:26 +0300
commit1aafea91e5e11c355b978c85544059224ec473cf (patch)
treea6fe26c7dc5503bdb62ef60d3e7d5f4ca2b816bb /extra
parentfee40e27738122d5c7d7916a1cfa8cd2b5a20186 (diff)
parentcebec393cf0a5558a2800fb193ba098bda4eabe1 (diff)
downloadmariadb-git-1aafea91e5e11c355b978c85544059224ec473cf.tar.gz
Merge with 5.1
Fixed valgrind warnings found from running main.connect under valgrind sql/sp_head.cc: Ensure that vcol_info is reset sql/sql_acl.cc: Fixed usage of wrong memroot for password sql/sql_yacc.yy: Ensure that vcol_info is reset
Diffstat (limited to 'extra')
-rw-r--r--extra/comp_err.c2
-rw-r--r--extra/libevent/kqueue.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c
index 9326444ade9..bca8d3895cb 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -660,7 +660,7 @@ static ha_checksum checksum_format_specifier(const char* msg)
case 'u':
case 'x':
case 's':
- chksum= my_checksum(chksum, start, (uint) (p + 1 - start));
+ chksum= my_checksum(chksum, (uchar*) start, (uint) (p + 1 - start));
start= 0; /* Not in format specifier anymore */
break;
diff --git a/extra/libevent/kqueue.c b/extra/libevent/kqueue.c
index 775698baa67..eec5a6ab6fb 100644
--- a/extra/libevent/kqueue.c
+++ b/extra/libevent/kqueue.c
@@ -144,7 +144,7 @@ kq_init(struct event_base *base)
*/
if (kevent(kq,
kqueueop->changes, 1, kqueueop->events, NEVENT, NULL) != 1 ||
- kqueueop->events[0].ident != -1 ||
+ ((int) kqueueop->events[0].ident) != -1 ||
kqueueop->events[0].flags != EV_ERROR) {
event_warn("%s: detected broken kqueue; not using.", __func__);
free(kqueueop->changes);