Commit 4fb0b9b8 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/space/my/mysql-5.0


sql/sql_select.cc:
  Auto merged
parents 3358d782 a0d18bd4

VC++Files/libmysql/libmysql.dsp

+0 −4
Original line number Diff line number Diff line
@@ -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

sql/item_func.cc

+0 −1
Original line number Diff line number Diff line
@@ -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)

sql/sql_select.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;

sql/unireg.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;