summaryrefslogtreecommitdiff
path: root/sql/strfunc.cc
diff options
context:
space:
mode:
authormonty@nosik.monty.fi <>2006-11-22 14:11:36 +0200
committermonty@nosik.monty.fi <>2006-11-22 14:11:36 +0200
commit89570bf966570ecce761e1fea2bb5d10db91f621 (patch)
treebd11d4efaf1d6469e7f29237347f12cdf71e605a /sql/strfunc.cc
parent38a92caeb77c6b22eeac985530cfbfdc890c792d (diff)
parent306b871d522b1fa744abf78acaafab2379a98401 (diff)
downloadmariadb-git-89570bf966570ecce761e1fea2bb5d10db91f621.tar.gz
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'sql/strfunc.cc')
-rw-r--r--sql/strfunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/strfunc.cc b/sql/strfunc.cc
index ef769a5b16e..2d2530eb876 100644
--- a/sql/strfunc.cc
+++ b/sql/strfunc.cc
@@ -150,7 +150,7 @@ uint find_type2(TYPELIB *typelib, const char *x, uint length, CHARSET_INFO *cs)
int pos;
const char *j;
DBUG_ENTER("find_type2");
- DBUG_PRINT("enter",("x: '%.*s' lib: 0x%lx", length, x, typelib));
+ DBUG_PRINT("enter",("x: '%.*s' lib: 0x%lx", length, x, (long) typelib));
if (!typelib->count)
{