From b668fc7525066565a5b02a43af01a1ca8f4574aa Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 1 Apr 2005 19:00:14 -0800 Subject: Clean up merge of fix for Bug #9468. mysql-test/t/lowercase_table_grant.test: Disable test with embedded server mysql-test/t/skip_name_resolve.test: Disable test with embedded server sql/sql_parse.cc: Reset server status after a single statement in a multistatement query is handled in embedded server so it is not logged twice to the slow query log. --- mysql-test/t/lowercase_table_grant.test | 3 +++ mysql-test/t/skip_name_resolve.test | 3 +++ 2 files changed, 6 insertions(+) (limited to 'mysql-test') diff --git a/mysql-test/t/lowercase_table_grant.test b/mysql-test/t/lowercase_table_grant.test index 5ac35c81c21..3d6adb477a3 100644 --- a/mysql-test/t/lowercase_table_grant.test +++ b/mysql-test/t/lowercase_table_grant.test @@ -1,3 +1,6 @@ +# Don't test with embedded server +-- source include/not_embedded.inc + # Test of grants when lower_case_table_names is on use mysql; diff --git a/mysql-test/t/skip_name_resolve.test b/mysql-test/t/skip_name_resolve.test index 68dcf329427..b669579acbf 100644 --- a/mysql-test/t/skip_name_resolve.test +++ b/mysql-test/t/skip_name_resolve.test @@ -1,3 +1,6 @@ +# Can't be tested with embedded server +-- source include/not_embedded.inc + # Bug #8471: IP address with mask fail when skip-name-resolve is on GRANT ALL ON test.* TO mysqltest_1@'127.0.0.1/255.255.255.255'; SHOW GRANTS FOR mysqltest_1@'127.0.0.1/255.255.255.255'; -- cgit v1.2.1