summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2010-12-02 08:16:26 +0100
committerTor Didriksen <tor.didriksen@oracle.com>2010-12-02 08:16:26 +0100
commite7c62beba754c0f2e8320cc462a67b74904be8e2 (patch)
tree1a7fe67f2ae893752dd504c6443cd2dc6d5eeca2 /sql/sql_plugin.cc
parent65faf729cd41f9632df03957596390b8221360d5 (diff)
parentd56a6dd02792e9a6bd5d0a644feb152f4cdae0a1 (diff)
downloadmariadb-git-e7c62beba754c0f2e8320cc462a67b74904be8e2.tar.gz
merge from 5.1-bugteam
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r--sql/sql_plugin.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 5b53ca9d8b6..dc5b7b5a37b 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -428,7 +428,8 @@ static st_plugin_dl *plugin_dl_add(const LEX_STRING *dl, int report)
struct st_plugin_dl *tmp, plugin_dl;
void *sym;
DBUG_ENTER("plugin_dl_add");
- DBUG_PRINT("enter", ("dl->str: '%s', dl->length: %d", dl->str, dl->length));
+ DBUG_PRINT("enter", ("dl->str: '%s', dl->length: %d",
+ dl->str, (int) dl->length));
plugin_dir_len= strlen(opt_plugin_dir);
/*
Ensure that the dll doesn't have a path.