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/sp.cc | |
| parent | 7714adaef85cb7d83b1624db2198aec40ddefa24 (diff) | |
| download | mariadb-git-90b43902b0e67bcd4c6a5f08d7d76c93df74d4c8.tar.gz | |
compilation warnings on Windows
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 6071a60a64f..24f7ed4ba90 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -42,11 +42,11 @@ create_string(THD *thd, String *buf, st_sp_chistics *chistics, const LEX_STRING *definer_user, const LEX_STRING *definer_host, - ulong sql_mode); + ulonglong sql_mode); static int db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp, - ulong sql_mode, const char *params, const char *returns, + ulonglong sql_mode, const char *params, const char *returns, const char *body, st_sp_chistics &chistics, const char *definer, longlong created, longlong modified, Stored_program_creation_ctx *creation_ctx); @@ -541,7 +541,7 @@ db_find_routine(THD *thd, int type, sp_name *name, sp_head **sphp) char buff[65]; String str(buff, sizeof(buff), &my_charset_bin); bool saved_time_zone_used= thd->time_zone_used; - ulong sql_mode, saved_mode= thd->variables.sql_mode; + ulonglong sql_mode, saved_mode= thd->variables.sql_mode; Open_tables_backup open_tables_state_backup; Stored_program_creation_ctx *creation_ctx; @@ -715,11 +715,11 @@ Silence_deprecated_warning::handle_condition( @retval 0 error */ -static sp_head *sp_compile(THD *thd, String *defstr, ulong sql_mode, +static sp_head *sp_compile(THD *thd, String *defstr, ulonglong sql_mode, Stored_program_creation_ctx *creation_ctx) { sp_head *sp; - ulong old_sql_mode= thd->variables.sql_mode; + ulonglong old_sql_mode= thd->variables.sql_mode; ha_rows old_select_limit= thd->variables.select_limit; sp_rcontext *old_spcont= thd->spcont; Silence_deprecated_warning warning_handler; @@ -760,7 +760,7 @@ static sp_head *sp_compile(THD *thd, String *defstr, ulong sql_mode, static int db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp, - ulong sql_mode, const char *params, const char *returns, + ulonglong sql_mode, const char *params, const char *returns, const char *body, st_sp_chistics &chistics, const char *definer, longlong created, longlong modified, Stored_program_creation_ctx *creation_ctx) @@ -923,7 +923,7 @@ sp_create_routine(THD *thd, int type, sp_head *sp) int ret; TABLE *table; char definer[USER_HOST_BUFF_SIZE]; - ulong saved_mode= thd->variables.sql_mode; + ulonglong saved_mode= thd->variables.sql_mode; MDL_key::enum_mdl_namespace mdl_type= type == TYPE_ENUM_FUNCTION ? MDL_key::FUNCTION : MDL_key::PROCEDURE; @@ -2079,7 +2079,6 @@ int sp_cache_routine(THD *thd, int type, sp_name *name, Returns TRUE on success, FALSE on (alloc) failure. */ static bool - create_string(THD *thd, String *buf, int type, const char *db, ulong dblen, @@ -2090,9 +2089,9 @@ create_string(THD *thd, String *buf, st_sp_chistics *chistics, const LEX_STRING *definer_user, const LEX_STRING *definer_host, - ulong sql_mode) + ulonglong sql_mode) { - ulong old_sql_mode= thd->variables.sql_mode; + ulonglong old_sql_mode= thd->variables.sql_mode; /* Make some room to begin with */ if (buf->alloc(100 + dblen + 1 + namelen + paramslen + returnslen + bodylen + chistics->comment.length + 10 /* length of " DEFINER= "*/ + |