diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-07-31 19:29:07 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-07-31 19:29:07 +0200 |
| commit | 0117a92fedc2e5294682127d54034af5b3f96c8e (patch) | |
| tree | 0c075a3fa43f64a3895acc704bacf69a96afda14 /unittest | |
| parent | 42ea25d4c51b5466b4b03a29abe480e763732cf2 (diff) | |
| download | mariadb-git-0117a92fedc2e5294682127d54034af5b3f96c8e.tar.gz | |
MDEV-419 ensure that all HAVE_XXX constants can be set by cmake
add missing checks to configure.cmake
remove dead code and unused HAVE_xxx constants from the sources
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, |