summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-19 17:36:19 +0400
committerAlexander Nozdrin <alik@sun.com>2009-10-19 17:36:19 +0400
commit3fd2f50b6c24a41cc9840c32eeca56175d48a566 (patch)
treeab9b420b768d8a6eb5ccda680604108cfee71b81 /strings
parent1c3de291f72f0f05c9ae688dcf8d7d2de972ced8 (diff)
parentb930b18ec3463e47736647c26af0eea07c242a63 (diff)
downloadmariadb-git-3fd2f50b6c24a41cc9840c32eeca56175d48a566.tar.gz
Merge from mysql-trunk-merge.
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-simple.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index 7de00025eda..4f3aaa6f668 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -185,8 +185,8 @@ int my_strnncollsp_simple(CHARSET_INFO * cs, const uchar *a, size_t a_length,
}
for (end= a + a_length-length; a < end ; a++)
{
- if (map[*a] != ' ')
- return (map[*a] < ' ') ? -swap : swap;
+ if (map[*a] != map[' '])
+ return (map[*a] < map[' ']) ? -swap : swap;
}
}
return res;