diff options
| author | mkindahl@dl145h.mysql.com <> | 2007-12-19 18:51:46 +0100 |
|---|---|---|
| committer | mkindahl@dl145h.mysql.com <> | 2007-12-19 18:51:46 +0100 |
| commit | bdea24f48358db2a7e6a74a7beba64b245b484ab (patch) | |
| tree | b4347d5d5af8e563fdef89ebf94232b92415803c /sql/sql_string.cc | |
| parent | 16f0bd712e184deda90f91a0e9ec2a13a6db22bf (diff) | |
| parent | fabaa50cd969dc8be45cd3679389c4edef34e403 (diff) | |
| download | mariadb-git-bdea24f48358db2a7e6a74a7beba64b245b484ab.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 2e076af45eb..7fa3786c382 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -297,8 +297,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); |