Commit a3fe7c09 authored by monty@narttu.mysql.fi's avatar monty@narttu.mysql.fi

Remove compiler warnings

Simple cleanup of previous pull
parent 22bce83c
......@@ -1558,7 +1558,7 @@ longlong Item_func_elt::val_int()
if ((tmp=(uint) item->val_int()) == 0 || tmp > arg_count)
return 0;
int result= args[tmp-1]->val_int();
longlong result= args[tmp-1]->val_int();
null_value= args[tmp-1]->null_value;
return result;
}
......
......@@ -406,10 +406,15 @@ class Load_log_event: public Log_event
/* fname doesn't point to memory inside Log_event::temp_buf */
void set_fname_outside_temp_buf(const char *afname, uint alen)
{fname=afname;fname_len=alen;}
{
fname= afname;
fname_len= alen;
}
/* fname doesn't point to memory inside Log_event::temp_buf */
int check_fname_outside_temp_buf()
{return fname<temp_buf || fname>temp_buf+cached_event_len;}
{
return fname < temp_buf || fname > temp_buf+ cached_event_len;
}
#ifndef MYSQL_CLIENT
String field_lens_buf;
......
......@@ -744,7 +744,7 @@ void Query_cache::store_query(THD *thd, TABLE_LIST *tables_used)
DBUG_VOID_RETURN;
if ((local_tables= is_cacheable(thd, thd->query_length,
thd->query, &thd->lex, tables_used)))
thd->query, &thd->lex, tables_used)))
{
NET *net= &thd->net;
byte flags= (thd->client_capabilities & CLIENT_LONG_FLAG ? 0x80 : 0);
......
......@@ -234,7 +234,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
}
if (cond && !cond->val_int())
continue;
if (!err && num_rows >= offset_limit)
if (num_rows >= offset_limit)
{
String *packet = &thd->packet;
Item *item;
......
......@@ -501,7 +501,10 @@ check_connections(THD *thd)
#if !defined(HAVE_SYS_UN_H) || defined(HAVE_mit_thread)
/* Fast local hostname resolve for Win32 */
if (!strcmp(thd->ip,"127.0.0.1"))
thd->host= thd->host_or_ip= (char*) localhost;
{
thd->host= (char*) localhost;
thd->host_or_ip= localhost;
}
else
#endif
if (!(specialflag & SPECIAL_NO_RESOLVE))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment