diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-09-01 00:54:54 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-09-01 00:54:54 +0300 |
| commit | 1999be8d4e9d721243c51b04c76ba11ad1e9fa56 (patch) | |
| tree | cd287f49c709f844d10d774643feb5843acf99a6 /unittest | |
| parent | 5a86a61219826aadf8d08cbc447fe438f2bf50c3 (diff) | |
| parent | b45c551ee32d0d5260f4958abf93efab1a4614a2 (diff) | |
| download | mariadb-git-1999be8d4e9d721243c51b04c76ba11ad1e9fa56.tar.gz | |
Automatic merge with 5.5
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/mysys/ma_dyncol-t.c | 2 | ||||
| -rw-r--r-- | unittest/strings/strings-t.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/unittest/mysys/ma_dyncol-t.c b/unittest/mysys/ma_dyncol-t.c index 11731ae81d4..4a9b687bc08 100644 --- a/unittest/mysys/ma_dyncol-t.c +++ b/unittest/mysys/ma_dyncol-t.c @@ -194,7 +194,7 @@ static CHARSET_INFO *charset_list[]= #endif #ifdef HAVE_CHARSET_utf8 &my_charset_utf8_general_ci, -#ifdef HAVE_HAVE_UCA_COLLATIONS +#ifdef HAVE_UCA_COLLATIONS &my_charset_utf8_unicode_ci, #endif &my_charset_utf8_bin, diff --git a/unittest/strings/strings-t.c b/unittest/strings/strings-t.c index 7e61cb8722e..6baef0417a8 100644 --- a/unittest/strings/strings-t.c +++ b/unittest/strings/strings-t.c @@ -87,7 +87,7 @@ static CHARSET_INFO *charset_list[]= #endif #ifdef HAVE_CHARSET_utf8 &my_charset_utf8_general_ci, -#ifdef HAVE_HAVE_UCA_COLLATIONS +#ifdef HAVE_UCA_COLLATIONS &my_charset_utf8_unicode_ci, #endif &my_charset_utf8_bin, |