Commit a85e8a3f authored by hezx@hezx.(none)'s avatar hezx@hezx.(none)
Browse files

Merge hezx.(none):/media/hda5/work/mysql/bkroot/mysql-5.0-rpl 

into  hezx.(none):/media/hda5/work/mysql/bkwork/bug#30998/5.0
parents c267a923 25debb1d

sql/sql_string.cc

+2 −2
Original line number Diff line number Diff line
@@ -307,8 +307,8 @@ bool String::copy_aligned(const char *str,uint32 arg_length, uint32 offset, 
    return TRUE;

  

  /*

    Note, this is only safe for little-endian UCS-2.

    If we add big-endian UCS-2 sometimes, this code

    Note, this is only safe for big-endian UCS-2.

    If we add little-endian UCS-2 sometimes, this code

    will be more complicated. But it's OK for now.

  */

  bzero((char*) Ptr, offset);