diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-29 23:53:07 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-29 23:53:07 +0100 |
| commit | 49e3024c1a1e950e0fe9fecbccfd13c9728a5b82 (patch) | |
| tree | 2e5fd2ea8d04d6274f3da86ac5b02bed3f38bb8a /sql/sql_acl.cc | |
| parent | cadef27521616ba6caea1556ae053a09e3bde6d8 (diff) | |
| parent | 4b13e338241778aefad46fde158a4cb99db083e1 (diff) | |
| download | mariadb-git-49e3024c1a1e950e0fe9fecbccfd13c9728a5b82.tar.gz | |
Merge 192.168.0.5:mysql/mysql-5.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
sql/field_conv.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index aa13c2f08f4..721b6b5a003 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3871,7 +3871,7 @@ bool check_grant_column(THD *thd, GRANT_INFO *grant, GRANT_COLUMN *grant_column; ulong want_access= grant->want_privilege & ~grant->privilege; DBUG_ENTER("check_grant_column"); - DBUG_PRINT("enter", ("table: %s want_access: %u", table_name, want_access)); + DBUG_PRINT("enter", ("table: %s want_access: %lu", table_name, want_access)); if (!want_access) DBUG_RETURN(0); // Already checked |