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

Remove compiler warnings

Browse Source 
Simple cleanup of previous pull


sql/item_strfunc.cc:
  Removed compiler warning
sql/sql_cache.cc:
  Indentation fix
sql/sql_handler.cc:
  Simple ptimization
sql/sql_parse.cc:
  Removed compiler warning
sql/log_event.h:
  Indentation fix
This commit is contained in:
unknown 2003-07-04 23:06:19 +03:00
parent 4e4ab26f53
commit 4e61b75d8b
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_strfunc.cc
View File

@ -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;
}

9
sql/log_event.h
View File

@ -406,10 +406,15 @@ public:
/* 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;

2
sql/sql_cache.cc
View File

@ -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);

2
sql/sql_handler.cc
View File

@ -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;

5
sql/sql_parse.cc
View File

@ -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))