diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-28 16:51:09 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-28 16:51:09 +0300 |
| commit | 7b91240bbab3094c8c148c46949c0202ae1e991d (patch) | |
| tree | 089b3976be2b065d307fdd01b8db6de7d473a16f /unittest/strings | |
| parent | 85a789998872c7215f24ba89f0d1f2335e314d07 (diff) | |
| download | mariadb-git-7b91240bbab3094c8c148c46949c0202ae1e991d.tar.gz | |
Fixed build & test failures in buildbot
mysql-test/t/bug46080-master.opt:
Lower limits to be able to run tests
regex/main.c:
Fixed compiler warnings
storage/maria/ma_key_recover.c:
Fixed compiler warnings
storage/maria/ma_recovery.c:
Fixed compiler warnings
storage/maria/ma_unique.c:
Fixed compiler warnings
strings/ctype-uca.c:
Added comment
strings/xml.c:
Fixed compiler warnings
support-files/compiler_warnings.supp:
Added suppressions for windows
unittest/strings/strings-t.c:
Added ifdef to fix compilation failure when compiling without UCA
Diffstat (limited to 'unittest/strings')
| -rw-r--r-- | unittest/strings/strings-t.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/unittest/strings/strings-t.c b/unittest/strings/strings-t.c index 278f42e56a5..cb33af3ac03 100644 --- a/unittest/strings/strings-t.c +++ b/unittest/strings/strings-t.c @@ -87,7 +87,9 @@ static CHARSET_INFO *charset_list[]= #endif #ifdef HAVE_CHARSET_utf8 &my_charset_utf8_general_ci, +#ifdef HAVE_HAVE_UCA_COLLATIONS &my_charset_utf8_unicode_ci, +#endif &my_charset_utf8_bin, #endif }; |