diff options
| author | jani@hynda.mysql.fi <> | 2007-11-26 11:27:01 +0200 |
|---|---|---|
| committer | jani@hynda.mysql.fi <> | 2007-11-26 11:27:01 +0200 |
| commit | 2e034c1e3b2473d045982758f7bfc5ba58c9225b (patch) | |
| tree | f6e52bbf6584ae0b2328b268ba417e4c88945e3e /storage/myisam/mi_unique.c | |
| parent | bf6cf069f151f7a5e2c4e8c66e568ef1240ff756 (diff) | |
| parent | d3a0ce08c739c721c3383ba9d36ceb7544e058e3 (diff) | |
| download | mariadb-git-2e034c1e3b2473d045982758f7bfc5ba58c9225b.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
Diffstat (limited to 'storage/myisam/mi_unique.c')
| -rw-r--r-- | storage/myisam/mi_unique.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_unique.c b/storage/myisam/mi_unique.c index e490fb683e4..02fcd9289dd 100644 --- a/storage/myisam/mi_unique.c +++ b/storage/myisam/mi_unique.c @@ -212,7 +212,7 @@ int mi_unique_comp(MI_UNIQUEDEF *def, const uchar *a, const uchar *b, if (type == HA_KEYTYPE_TEXT || type == HA_KEYTYPE_VARTEXT1 || type == HA_KEYTYPE_VARTEXT2) { - if (mi_compare_text(keyseg->charset, (uchar *) pos_a, a_length, + if (ha_compare_text(keyseg->charset, (uchar *) pos_a, a_length, (uchar *) pos_b, b_length, 0, 1)) return 1; } |