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

Windows compile fixups (To be verified by respective devs)

Browse Source 
sql/field.cc:
  Windows - Cast (longlong -> uint)
sql/item_uniq.h:
  Windows compile fix
sql/sql_derived.cc:
  Windows - compile fix
This commit is contained in:
unknown 2003-02-04 18:50:48 -08:00
parent 5a7189cf8c
commit 15b099cf02
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/field.cc
View File

@ -1913,7 +1913,7 @@ int Field_longlong::store(const char *from,uint len,CHARSET_INFO *cs)
char *end; char *end;
tmp= cs->scan(cs, from, from+len, MY_SEQ_SPACES); tmp= cs->scan(cs, from, from+len, MY_SEQ_SPACES);
len-= tmp; len-= (uint)tmp;
from+= tmp; from+= tmp;
my_errno=0; my_errno=0;
if (unsigned_flag) if (unsigned_flag)

2
sql/item_uniq.h
View File

@ -50,7 +50,7 @@ public:
fixed= 1; fixed= 1;
return 0; return 0;
} }
Item_sum *copy_or_same(THD* thd) Item *copy_or_same(THD* thd)
{ {
return new Item_sum_unique_users(thd, *this); return new Item_sum_unique_users(thd, *this);
} }

2
sql/sql_derived.cc
View File

@ -71,7 +71,7 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit, TABLE_LIST *t)
TABLE_LIST *tables= (TABLE_LIST *)sl->table_list.first; TABLE_LIST *tables= (TABLE_LIST *)sl->table_list.first;
TMP_TABLE_PARAM tmp_table_param; TMP_TABLE_PARAM tmp_table_param;
bool is_union= sl->next_select() && sl->next_select()->linkage == UNION_TYPE; bool is_union= sl->next_select() && sl->next_select()->linkage == UNION_TYPE;
bool is_subsel= sl->first_inner_unit(); bool is_subsel= sl->first_inner_unit() ? 1: 0;
SELECT_LEX_NODE *save_current_select= lex->current_select; SELECT_LEX_NODE *save_current_select= lex->current_select;
DBUG_ENTER("mysql_derived"); DBUG_ENTER("mysql_derived");