summaryrefslogtreecommitdiff
path: root/sql/create_options.cc
diff options
context:
space:
mode:
authorGalina Shalygina <galashalygina@gmail.com>2016-05-25 00:34:13 +0300
committerGalina Shalygina <galashalygina@gmail.com>2016-05-25 00:34:13 +0300
commit6c6c3af6aac428df8a934beeba15cc4ce77cbe01 (patch)
tree2f8241944db8952e6a54a417414773dd0b5b0b4e /sql/create_options.cc
parentb4f1f42062d108230b62ad49fedd93ee6e38e168 (diff)
parentc7c2f8d4a0dedd52795b7f8a6971c35ea46cc016 (diff)
downloadmariadb-git-10.2-test1234.tar.gz
Merge branch '10.2' into 10.2-mdev986410.2-test1234
Diffstat (limited to 'sql/create_options.cc')
-rw-r--r--sql/create_options.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/create_options.cc b/sql/create_options.cc
index 66515be05b8..3011c4b2d7e 100644
--- a/sql/create_options.cc
+++ b/sql/create_options.cc
@@ -184,7 +184,7 @@ static bool set_one_value(ha_create_table_option *opt,
{
for (end=start;
*end && *end != ',';
- end+= my_mbcharlen(system_charset_info, *end)) /* no-op */;
+ end++) /* no-op */;
if (!my_strnncoll(system_charset_info,
(uchar*)start, end-start,
(uchar*)value->str, value->length))