diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 15:21:28 +0100 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 15:21:28 +0100 |
| commit | 90578ce767ed8419c0014aa3175e3f6e58a60128 (patch) | |
| tree | e5a5f3cfe1fd04961923f4d1b6742a81eb6ef226 /sql/strfunc.cc | |
| parent | 004aadd6f716e2bdd055a2518b50bd8d13e961e8 (diff) | |
| parent | 867fc51c5d9227f8f2892d11b98becfa508baba7 (diff) | |
| download | mariadb-git-90578ce767ed8419c0014aa3175e3f6e58a60128.tar.gz | |
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
mysql-test/t/view_grant.test:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/strfunc.cc')
| -rw-r--r-- | sql/strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/strfunc.cc b/sql/strfunc.cc index c822d10af46..d03d88ee051 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) { |