diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
| commit | cd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch) | |
| tree | 95bf82d0e0522c6af708cd28639c82e004b5a264 /storage/maria/ma_write.c | |
| parent | f884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff) | |
| parent | d516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff) | |
| download | mariadb-git-10.2-connector-c-integ.tar.gz | |
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'storage/maria/ma_write.c')
| -rw-r--r-- | storage/maria/ma_write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_write.c b/storage/maria/ma_write.c index f57c462e7c0..63bbdf83854 100644 --- a/storage/maria/ma_write.c +++ b/storage/maria/ma_write.c @@ -880,7 +880,7 @@ ChangeSet@1.2562, 2008-04-09 07:41:40+02:00, serg@janus.mylan +9 -0 DBUG_ASSERT(info->ft1_to_ft2==0); if (alen == blen && ha_compare_text(keyinfo->seg->charset, a, alen, - b, blen, 0, 0) == 0) + b, blen, 0) == 0) { /* Yup. converting */ info->ft1_to_ft2=(DYNAMIC_ARRAY *) |