From 401c69e49babc293da30f833c18673f5f071eca3 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Mon, 30 Aug 2010 16:25:23 +0300 Subject: [PATCH] Fixed test failure mysql-test/t/loaddata.test: Don't run test if ucs2 is not compiled --- mysql-test/t/loaddata.test | 2 ++ support-files/compiler_warnings.supp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test index 821453777f5..53eae4fdfaa 100644 --- a/mysql-test/t/loaddata.test +++ b/mysql-test/t/loaddata.test @@ -2,6 +2,8 @@ # Some simple test of load data # +-- source include/have_ucs2.inc + --disable_warnings drop table if exists t1, t2; --enable_warnings diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index fc861a1c830..a56c39b51a0 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -112,6 +112,8 @@ signal\.c : .*unused parameter.* .* : conversion from '.*size_t' to 'uInt'.* .* : conversion from '.*size_t' to 'uint16'.* .* : The following environment variables were not found.* +.* : no public symbols found; archive member will be inaccessible +.* : DESCRIPTION statement not supported # Ignore uninitialized local variables on windows .* : uninitialized local variable .* used