diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-23 11:22:56 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-23 11:22:56 +0200 |
| commit | 1c23091c4ecc23100a6fe42288819cf4d5dc0b5b (patch) | |
| tree | db09f3c0fa94cc3151b0b50e57008e361608aa98 /mysql-test | |
| parent | e079f3c84a24e67f2da3ae0b0c338d5b79dc9516 (diff) | |
| download | mariadb-git-1c23091c4ecc23100a6fe42288819cf4d5dc0b5b.tar.gz | |
Fixed build failures
- Removed references to deleted files
- If we link staticly, check for static zlib
- This should fix the problem with 'no -lz found' link error
- Fixed build failure on window (Patch from Wlad)
- Fixed build problem with federatedx when using -Werror
BUILD/Makefile.am:
Remove removed file
config/ac-macros/zlib.m4:
If we compile with --all-static, test that we have a static libz
libmysqld/CMakeLists.txt:
Fix for build error on windows
mysql-test/suite/pbxt/r/key_cache.result:
Updated result
mysql-test/suite/pbxt/t/key_cache.test:
Fixed not updated test case
sql/CMakeLists.txt:
Fix for build error on windows
storage/federatedx/Makefile.am:
Don't use CFLAGS to compile C++ programs
storage/pbxt/src/lock_xt.cc:
Fixed compiler warning about using uninitialized b2
storage/xtradb/buf/buf0buf.c:
Fixed wrong printf
storage/xtradb/srv/srv0srv.c:
Fixed assignment of different width and test with different sign/unsigned
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/pbxt/r/key_cache.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/pbxt/t/key_cache.test | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/pbxt/r/key_cache.result b/mysql-test/suite/pbxt/r/key_cache.result index 5ff41bd29d7..1ea3b2a714a 100644 --- a/mysql-test/suite/pbxt/r/key_cache.result +++ b/mysql-test/suite/pbxt/r/key_cache.result @@ -315,8 +315,7 @@ test.t1 check status OK DROP TABLE t1,t2; set global key_cache_block_size= @my_key_cache_block_size; set @@global.key_buffer_size=0; -Warnings: -Warning 1438 Cannot drop default keycache +ERROR HY000: Cannot drop default keycache select @@global.key_buffer_size; @@global.key_buffer_size 1048576 diff --git a/mysql-test/suite/pbxt/t/key_cache.test b/mysql-test/suite/pbxt/t/key_cache.test index 10dbdda6068..99d785db014 100644 --- a/mysql-test/suite/pbxt/t/key_cache.test +++ b/mysql-test/suite/pbxt/t/key_cache.test @@ -220,6 +220,7 @@ set global key_cache_block_size= @my_key_cache_block_size; # Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO # (One cannot drop the default key cache.) # +--error ER_WARN_CANT_DROP_DEFAULT_KEYCACHE set @@global.key_buffer_size=0; select @@global.key_buffer_size; |