1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation warnings.

Browse Source
This commit is contained in:
Alexander Nozdrin 2010-10-12 14:07:13 +04:00
parent c0557845a1
commit 26e12a11bb
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql-common/client.c
View File

@ -2923,7 +2923,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
uint port, const char *unix_socket,ulong client_flag) uint port, const char *unix_socket,ulong client_flag)
{ {
char buff[NAME_LEN+USERNAME_LENGTH+100]; char buff[NAME_LEN+USERNAME_LENGTH+100];
int scramble_data_len, pkt_scramble_len; int scramble_data_len, pkt_scramble_len= 0;
char *end,*host_info= 0, *server_version_end, *pkt_end; char *end,*host_info= 0, *server_version_end, *pkt_end;
char *scramble_data; char *scramble_data;
const char *scramble_plugin; const char *scramble_plugin;

2
sql/sql_acl.cc
View File

@ -3936,7 +3936,7 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
ulong rights, bool revoke_grant, bool is_proxy) ulong rights, bool revoke_grant, bool is_proxy)
{ {
List_iterator <LEX_USER> str_list (list); List_iterator <LEX_USER> str_list (list);
LEX_USER *Str, *tmp_Str, *proxied_user; LEX_USER *Str, *tmp_Str, *proxied_user= NULL;
char tmp_db[NAME_LEN+1]; char tmp_db[NAME_LEN+1];
bool create_new_users=0; bool create_new_users=0;
TABLE_LIST tables[2]; TABLE_LIST tables[2];

3
sql/sql_cache.cc
View File

@ -412,7 +412,8 @@ struct Query_cache_wait_state
Query_cache_wait_state(THD *thd, const char *func, Query_cache_wait_state(THD *thd, const char *func,
const char *file, unsigned int line) const char *file, unsigned int line)
: m_thd(thd) : m_thd(thd),
m_proc_info(NULL)
{ {
if (m_thd) if (m_thd)
m_proc_info= set_thd_proc_info(m_thd, m_proc_info= set_thd_proc_info(m_thd,