summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <hezx@hezx.(none)>2007-12-11 17:34:37 +0800
committerunknown <hezx@hezx.(none)>2007-12-11 17:34:37 +0800
commit77f4d9124f4dde94ee677fa60f12eddfae20d817 (patch)
treed84309af7ad6966a919a12671ac9f4edbc3ac23d /sql
parentdf35f2c353c4453f3b5dbe56bb6ef4935312ffb7 (diff)
parentc4faf61acd405231954943548de200c9dce78101 (diff)
downloadmariadb-git-77f4d9124f4dde94ee677fa60f12eddfae20d817.tar.gz
Merge hezx.(none):/media/hda5/work/mysql/bkroot/mysql-5.0-rpl
into hezx.(none):/media/hda5/work/mysql/bkwork/bug#30998/5.0
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_string.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 9d7df73cd7a..278130db7bb 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -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);