diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-02 12:55:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-02 12:55:46 +0100 |
| commit | 90b43902b0e67bcd4c6a5f08d7d76c93df74d4c8 (patch) | |
| tree | abea3216f5299f3cb53c92e6a79e37daa883b78a /sql/sql_acl.cc | |
| parent | 7714adaef85cb7d83b1624db2198aec40ddefa24 (diff) | |
| download | mariadb-git-90b43902b0e67bcd4c6a5f08d7d76c93df74d4c8.tar.gz | |
compilation warnings on Windows
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 650c9d4e458..0fb8204856e 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -740,7 +740,7 @@ static my_bool acl_load(THD *thd, TABLE_LIST *tables) bool check_no_resolve= specialflag & SPECIAL_NO_RESOLVE; char tmp_name[SAFE_NAME_LEN+1]; int password_length; - ulong old_sql_mode= thd->variables.sql_mode; + ulonglong old_sql_mode= thd->variables.sql_mode; DBUG_ENTER("acl_load"); thd->variables.sql_mode&= ~MODE_PAD_CHAR_TO_FULL_LENGTH; @@ -4307,7 +4307,7 @@ static my_bool grant_load(THD *thd, TABLE_LIST *tables) bool check_no_resolve= specialflag & SPECIAL_NO_RESOLVE; MEM_ROOT **save_mem_root_ptr= my_pthread_getspecific_ptr(MEM_ROOT**, THR_MALLOC); - ulong old_sql_mode= thd->variables.sql_mode; + ulonglong old_sql_mode= thd->variables.sql_mode; DBUG_ENTER("grant_load"); thd->variables.sql_mode&= ~MODE_PAD_CHAR_TO_FULL_LENGTH; @@ -6541,7 +6541,7 @@ bool mysql_drop_user(THD *thd, List <LEX_USER> &list) List_iterator <LEX_USER> user_list(list); TABLE_LIST tables[GRANT_TABLES]; bool some_users_deleted= FALSE; - ulong old_sql_mode= thd->variables.sql_mode; + ulonglong old_sql_mode= thd->variables.sql_mode; bool save_binlog_row_based; DBUG_ENTER("mysql_drop_user"); |