From ec3c26a515ba5f52db28cfb06deba664fc61b7b5 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Sat, 2 Jul 2011 17:37:59 +0300 Subject: [PATCH] Fixed compilation & test issues found by buildbot include/Makefile.am: Added missing \ mysql-test/mysql-test-run.pl: Suppress warning when ha_archive is not compiled mysql-test/r/variables-big.result: Updated results --- include/Makefile.am | 2 +- mysql-test/mysql-test-run.pl | 1 + mysql-test/r/variables-big.result | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/Makefile.am b/include/Makefile.am index 2607afb938e..afc2afff115 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -22,7 +22,7 @@ HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \ my_list.h my_alloc.h typelib.h mysql/plugin.h pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ my_xml.h mysql_embed.h mysql/services.h \ - mysql/service_progress_report.h + mysql/service_progress_report.h \ mysql/service_my_snprintf.h mysql/service_thd_alloc.h \ my_pthread.h my_no_pthread.h \ mysql/plugin_auth.h mysql/client_plugin.h \ diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index e7aad90ce3f..fa2c159edb4 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4457,6 +4457,7 @@ sub extract_warning_lines ($$) { qr|Checking table: '\./mtr/test_suppressions'|, qr|Table \./test/bug53592 has a primary key in InnoDB data dictionary, but not in MySQL|, qr|mysqld: Table '\./mtr/test_suppressions' is marked as crashed and should be repaired|, + qr|Can't open shared library.*ha_archive|, qr|InnoDB: Error: table 'test/bug39438'|, ); diff --git a/mysql-test/r/variables-big.result b/mysql-test/r/variables-big.result index 71b32393d82..793363fc7c1 100644 --- a/mysql-test/r/variables-big.result +++ b/mysql-test/r/variables-big.result @@ -1,20 +1,20 @@ SET SESSION transaction_prealloc_size=1024*1024*1024*1; SHOW PROCESSLIST; -Id User Host db Command Time State Info - root test Query