summaryrefslogtreecommitdiff
path: root/sql/sql_string.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2013-03-11 13:50:17 +0400
committerAlexander Barkov <bar@mnogosearch.org>2013-03-11 13:50:17 +0400
commit421c885446ddf7a996cecb0d3831f7b1a10d3701 (patch)
treef1881bdb87fd7d1231163c7e85cc7baa4c6af3c7 /sql/sql_string.cc
parent8dad7dfa6ae40e54e814d3ba135f45bff0c13e8f (diff)
downloadmariadb-git-421c885446ddf7a996cecb0d3831f7b1a10d3701.tar.gz
The i386 specific code improving character set conversion on the ASCII range
was not enabled on x86_64 machines. Enabling it. Gives up to 18 times conversion performance improvement. modified: sql/sql_string.cc
Diffstat (limited to 'sql/sql_string.cc')
-rw-r--r--sql/sql_string.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index 75029a03790..4aba2ee51c5 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -843,7 +843,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