Commit 01ed9a32 authored by unknown's avatar unknown
Browse files

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

into beethoven.site:/home/georg/work/mysql/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
parents 3f0def33 af4b5c89

VC++Files/libmysqld/libmysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -344,6 +344,10 @@ SOURCE=..\mysys\my_alloc.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_decimal.cpp

# End Source File

# Begin Source File



SOURCE=..\mysys\my_getopt.c

# End Source File

# Begin Source File

VC++Files/sql/mysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -1085,6 +1085,10 @@ SOURCE=.\mf_iocache.cpp 
# End Source File

# Begin Source File



SOURCE=.\my_decimal.cpp

# End Source File

# Begin Source File



SOURCE=.\my_time.c

# End Source File

# Begin Source File

VC++Files/strings/strings.dsp

+4 −0
Original line number Diff line number Diff line
@@ -177,6 +177,10 @@ SOURCE=.\ctype.c 
# End Source File

# Begin Source File



SOURCE=.\decimal.c

# End Source File

# Begin Source File



SOURCE=.\int2str.c

# End Source File

# Begin Source File

sql/field.cc

+3 −3
Original line number Diff line number Diff line
@@ -1581,10 +1581,10 @@ bool Field_new_decimal::store_value(const my_decimal *decimal_value) 
    DBUG_PRINT("info", ("overflow"));

    set_value_on_overflow(&buff, dec->sign());

    my_decimal2binary(E_DEC_FATAL_ERROR, &buff, ptr, field_length, decimals());

    DBUG_EXECUTE("info", print_decimal_buff(&buff, ptr, bin_size););

    DBUG_EXECUTE("info", print_decimal_buff(&buff, (byte *) ptr, bin_size););

    DBUG_RETURN(1);

  }

  DBUG_EXECUTE("info", print_decimal_buff(dec, ptr, bin_size););

  DBUG_EXECUTE("info", print_decimal_buff(dec, (byte *) ptr, bin_size););

  DBUG_RETURN(error);

}
@@ -1708,7 +1708,7 @@ my_decimal* Field_new_decimal::val_decimal(my_decimal *decimal_value) 
  binary2my_decimal(E_DEC_FATAL_ERROR, ptr, decimal_value,

                    field_length,

                    decimals());

  DBUG_EXECUTE("info", print_decimal_buff(decimal_value, ptr, bin_size););

  DBUG_EXECUTE("info", print_decimal_buff(decimal_value, (byte *) ptr, bin_size););

  DBUG_RETURN(decimal_value);

}

sql/item.h

+4 −0
Original line number Diff line number Diff line
@@ -453,7 +453,11 @@ class Item_splocal : public Item 
  longlong val_int();

  String *val_str(String *sp);

  my_decimal *val_decimal(my_decimal *);

#ifdef __WIN__

  bool is_null();

#else

  inline bool is_null();

#endif

  void print(String *str);



  inline void make_field(Send_field *field)