summaryrefslogtreecommitdiff
path: root/sql/sql_string.cc
diff options
context:
space:
mode:
authormkindahl@dl145h.mysql.com <>2007-12-19 14:49:04 +0100
committermkindahl@dl145h.mysql.com <>2007-12-19 14:49:04 +0100
commita9daa2cd86845dfecf40705395674168d5f80376 (patch)
tree423226d4840625fd2226e02ca81f5dbdf8f058c3 /sql/sql_string.cc
parent4bb503568dc598d1e16fead04c9cebc4e78725df (diff)
parentc2f00cc3f94b213c06f2006f4e8d560939513011 (diff)
downloadmariadb-git-a9daa2cd86845dfecf40705395674168d5f80376.tar.gz
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
Diffstat (limited to 'sql/sql_string.cc')
-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 606a9ddb26d..75e47dd0c8e 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);