Commit a39f87f3 authored by unknown's avatar unknown
Browse files

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

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


sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
parents 6c8ae9d6 01ed9a32

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

ndb/src/common/util/NdbSqlUtil.cpp

+3 −12
Original line number Diff line number Diff line
@@ -633,17 +633,8 @@ NdbSqlUtil::cmpDate(const void* info, const void* p1, unsigned n1, const void* p 
    return 0;

  }

#else

  char t1[4], t2[4];

  if (n1 == 3 && n2 == 3)

  {

    memcpy(t1, p1, 3);

    memcpy(t2, p2, 3);

    p1 = t1;

    p2 = t2;

    n1 = n2 = 4;

  }

#ifdef ndb_date_sol9x86_cc_xO3_madness

  if (n2 >= 4) {        // may access 4-th byte

  if (n2 >= 3) {

    const uchar* v1 = (const uchar*)p1;

    const uchar* v2 = (const uchar*)p2;

    // from Field_newdate::val_int
@@ -658,7 +649,7 @@ NdbSqlUtil::cmpDate(const void* info, const void* p1, unsigned n1, const void* p 
    return 0;

  }

#else

  if (n2 >= 4) {

  if (n2 >= 3) {

    const uchar* v1 = (const uchar*)p1;

    const uchar* v2 = (const uchar*)p2;

    uint j1 = uint3korr(v1);
@@ -712,7 +703,7 @@ NdbSqlUtil::cmpText(const void* info, const void* p1, unsigned n1, const void* p 
int

NdbSqlUtil::cmpTime(const void* info, const void* p1, unsigned n1, const void* p2, unsigned n2, bool full)

{

  if (n2 >= 4) {        // may access 4-th byte

  if (n2 >= 3) {

    const uchar* v1 = (const uchar*)p1;

    const uchar* v2 = (const uchar*)p2;

    // from Field_time::val_int

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

}