From b3aed01ae93a31571a31804e35ff3b430b6efb8f Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 2 Dec 2014 19:15:16 +0100 Subject: [PATCH] fix include/not_embedded.inc to be independent from the environment in particular, not fail with --vertical_results --- mysql-test/include/not_embedded.inc | 7 +++---- mysql-test/r/not_embedded.require | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 mysql-test/r/not_embedded.require diff --git a/mysql-test/include/not_embedded.inc b/mysql-test/include/not_embedded.inc index c3a9c3e12c8..88185af3b15 100644 --- a/mysql-test/include/not_embedded.inc +++ b/mysql-test/include/not_embedded.inc @@ -4,8 +4,7 @@ # # The test below is redundant --- require r/not_embedded.require -disable_query_log; -select version() like '%embedded%' as 'have_embedded'; -enable_query_log; +if (`select version() like '%embedded%'`) { + This should never happen; +} diff --git a/mysql-test/r/not_embedded.require b/mysql-test/r/not_embedded.require deleted file mode 100644 index b2ea98bcd0a..00000000000 --- a/mysql-test/r/not_embedded.require +++ /dev/null @@ -1,2 +0,0 @@ -have_embedded -0