diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2007-12-19 14:49:04 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2007-12-19 14:49:04 +0100 |
| commit | 23f8f637b7909f6006064a051d3f83a0d5e871e6 (patch) | |
| tree | 423226d4840625fd2226e02ca81f5dbdf8f058c3 /sql/sql_string.cc | |
| parent | 7c96b5155cb0d88ce3fdffd248fe072a1a8253d8 (diff) | |
| parent | f53f0455989fb1fe7b65e0888bc5ae1b7900d72b (diff) | |
| download | mariadb-git-23f8f637b7909f6006064a051d3f83a0d5e871e6.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
sql/sql_string.cc:
Auto merged
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 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); |