Commit 70a61746 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/merge-4.1

parents da244cc9 609e4dc6

sql/item_strfunc.cc

+2 −2
Original line number Diff line number Diff line
@@ -1681,12 +1681,12 @@ String *Item_func_format::val_str(String *str) 
  if (str_length >= dec+4)

  {

    char *tmp,*pos;

    length= str->length()+(diff=(str_length- dec-1)/3);

    length= str->length()+(diff= (int)(str_length- dec-1)/3);

    str= copy_if_not_alloced(&tmp_str,str,length);

    str->length(length);

    tmp= (char*) str->ptr()+length - dec-1;

    for (pos= (char*) str->ptr()+length-1; pos != tmp; pos--)

      pos[0]= pos[-(int) diff];

      pos[0]= pos[-diff];

    while (diff)

    {

      *pos= *(pos - diff);