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

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/space/my/mysql-5.0
This commit is contained in:
lenz@mysql.com 2005-06-06 18:03:16 +02:00
commit 80fbb13e97
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VC++Files/libmysql/libmysql.dsp
View File

@ -147,10 +147,6 @@ SOURCE="..\strings\ctype-czech.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-cp932.c"
# End Source File
# Begin Source File
SOURCE="..\strings\ctype-euc_kr.c"
# End Source File
# Begin Source File

1
sql/item_func.cc
View File

@ -4724,7 +4724,6 @@ Item_func_sp::func_name() const
Field *
Item_func_sp::sp_result_field(void) const
{
Field *field;
DBUG_ENTER("Item_func_sp::sp_result_field");
if (!m_sp)

2
sql/sql_select.cc
View File

@ -7991,7 +7991,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
bool using_unique_constraint= 0;
bool use_packed_rows= 0;
bool not_all_columns= !(select_options & TMP_TABLE_ALL_COLUMNS);
char *tmpname,path[FN_REFLEN], filename[FN_REFLEN];
char *tmpname,path[FN_REFLEN];
byte *pos,*group_buff;
uchar *null_flags;
Field **reg_field, **from_field;

2
sql/unireg.cc
View File

@ -668,7 +668,7 @@ static bool make_empty_rec(THD *thd, File file,enum db_type table_type,
{
int error;
Field::utype type;
uint firstpos, null_count;
uint null_count;
uchar *buff,*null_pos;
TABLE table;
create_field *field;