From b7d7c62f24a50df6c105ff4157a864d4b6c59c12 Mon Sep 17 00:00:00 2001 From: "dlenev@brandersnatch.localdomain" <> Date: Sun, 26 Sep 2004 15:57:07 +0400 Subject: [PATCH] Disabled part of ps_1general.test behaving differently on different builds. (Until mysqltest will support replace_result and replace_column on metadata). --- mysql-test/r/ps_1general.result | 2 -- mysql-test/t/ps_1general.test | 11 +++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index 756ccd4d609..6dcdb0feab1 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -333,8 +333,6 @@ execute stmt1 ; ERROR 42S02: Unknown table 't5' prepare stmt1 from ' SELECT @@version ' ; execute stmt1 ; -Catalog Database Table Table_alias Column Column_alias Name Type Length Max length Is_null Flags Decimals Charsetnr -def @@VERSION 254 102 34 N 1 31 8 @@VERSION prepare stmt_do from ' do @var:= (1 in (select a from t1)) ' ; diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test index dfdde884359..f27aca7a452 100644 --- a/mysql-test/t/ps_1general.test +++ b/mysql-test/t/ps_1general.test @@ -344,12 +344,19 @@ execute stmt1 ; ## SELECT @@version # cases derived from client_test.c: test_select_version() ---enable_metadata +# +# TODO: Metadata check is temporary disabled here, because metadata of +# this statement also depends on @@version contents and you can't apply +# replace_column and replace_result to it. It will be enabled again when +# support of replace_column and replace_result on metadata will be +# implemented. +# +#--enable_metadata prepare stmt1 from ' SELECT @@version ' ; # egalize the version --replace_column 1 execute stmt1 ; ---disable_metadata +#--disable_metadata ## do @var:= and set @var= # cases derived from client_test.c: test_do_set()