diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-12-01 20:11:41 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-12-01 20:11:41 +0200 |
| commit | dad1322940f89aec19ff805c4218ea9daa766435 (patch) | |
| tree | 4fb2c7d90990eca849e13d6b25845d891e430399 /mysql-test/suite/innodb_plugin | |
| parent | 6378bdbf47af72b2f899853586faa5a2d2f0fee1 (diff) | |
| download | mariadb-git-dad1322940f89aec19ff805c4218ea9daa766435.tar.gz | |
Fixed that --with-libedit --without-readline works
Fixed buildbot failures (compiler warnings, failing tests)
cmd-line-utils/libedit/map.c:
Fixed compiler warning
cmd-line-utils/libedit/terminal.c:
Fixed compiler warning
cmd-line-utils/libedit/tty.c:
Fixed compiler warning
configure.in:
Fixed that --with-libedit --without-readline works
mysql-test/suite/innodb_plugin/t/innodb_misc1.test:
Fixed test that failed when characterset was missing
Diffstat (limited to 'mysql-test/suite/innodb_plugin')
| -rw-r--r-- | mysql-test/suite/innodb_plugin/t/innodb_misc1.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb_plugin/t/innodb_misc1.test b/mysql-test/suite/innodb_plugin/t/innodb_misc1.test index 31f9988d1ac..4d66701c927 100644 --- a/mysql-test/suite/innodb_plugin/t/innodb_misc1.test +++ b/mysql-test/suite/innodb_plugin/t/innodb_misc1.test @@ -1,5 +1,6 @@ -- source include/have_innodb_plugin.inc --- source include/have_utf8.inc +let collation=utf8_unicode_ci; +--source include/have_collation.inc let $MYSQLD_DATADIR= `select @@datadir`; |