diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 23:41:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 23:41:02 +0100 |
| commit | 993ea79f2df42292eceeee394e8ece9f4a3f6cf2 (patch) | |
| tree | d105c8288a89a25d412e9006b740c756db6326d6 /sql/sql_string.cc | |
| parent | 1827d9591e24ee469527021771088d842ab18374 (diff) | |
| parent | 6599fd3e9c23a8957a63146cbe6a0ffc4c292a3d (diff) | |
| download | mariadb-git-993ea79f2df42292eceeee394e8ece9f4a3f6cf2.tar.gz | |
5.5 merge
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 9d11677666f..095c557c531 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -796,7 +796,7 @@ copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs, uint32 length= min(to_length, from_length), length2= length; -#if defined(__i386__) +#if defined(__i386__) || defined(__x86_64__) /* Special loop for i386, it allows to refer to a non-aligned memory block as UINT32, which makes |