1 files changed, 15 insertions, 33 deletions
diff --git a/mysql-test/suite/parts/t/partition_exch_qa_6.test b/mysql-test/suite/parts/t/partition_exch_qa_6.test
index bad1e134af7..7b6b42480b0 100644
--- a/mysql-test/suite/parts/t/partition_exch_qa_6.test
+++ b/mysql-test/suite/parts/t/partition_exch_qa_6.test
@@ -1,8 +1,8 @@
 # Author: Horst Hunger
 # Created: 2010-07-06
 
---source include/not_embedded.inc
---source include/have_partition.inc
+source include/not_embedded.inc;
+source include/have_partition.inc;
 
 let $engine_table= MYISAM;
 let $engine_part= MYISAM;
@@ -10,93 +10,75 @@ let $engine_subpart= MYISAM;
 
 CREATE USER test2@localhost;
 
---disable_result_log
---disable_query_log
---source suite/parts/inc/part_exch_tabs.inc
---enable_result_log
---enable_query_log
+source suite/parts/inc/part_exch_tabs.inc;
 
 GRANT USAGE ON *.* TO test2@localhost;
 GRANT CREATE, DROP, ALTER, UPDATE, INSERT, SELECT ON test.* TO test2@localhost;
 
---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
-USE test;
 SHOW GRANTS FOR CURRENT_USER;
 # 9) Exchanges with different owner.
 # Privilege for ALTER and SELECT
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
---sorted_result
+sorted_result;
 SELECT * FROM t_10;
---sorted_result
+sorted_result;
 SELECT * FROM tp WHERE a BETWEEN 0 AND 10;
 # Back to former values.
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
---sorted_result
+sorted_result;
 SELECT * FROM t_10;
---sorted_result
+sorted_result;
 SELECT * FROM tp WHERE a BETWEEN 0 AND 10;
 ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
---sorted_result
+sorted_result;
 SELECT * FROM tsp_00;
---sorted_result
+sorted_result;
 SELECT * FROM tsp WHERE a BETWEEN 0 AND 10;
 # Back to former values.
 ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
---sorted_result
+sorted_result;
 SELECT * FROM tsp_00;
---sorted_result
+sorted_result;
 SELECT * FROM tsp WHERE a BETWEEN 0 AND 10;
---echo disconnect test2;
 disconnect test2;
 
---echo connection default;
 connection default;
 REVOKE INSERT ON test.* FROM test2@localhost;
 
---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 USE test;
 SHOW GRANTS FOR CURRENT_USER;
 # Privilege for ALTER and SELECT
---error ER_TABLEACCESS_DENIED_ERROR
+error ER_TABLEACCESS_DENIED_ERROR;
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
---echo disconnect test2;
 disconnect test2;
  
---echo connection default;
 connection default;
 GRANT INSERT ON test.* TO test2@localhost;
 REVOKE CREATE ON test.* FROM test2@localhost;
 
---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
 USE test;
 SHOW GRANTS FOR CURRENT_USER;
---error ER_TABLEACCESS_DENIED_ERROR
+error ER_TABLEACCESS_DENIED_ERROR;
 ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
---echo disconnect test2;
 disconnect test2;
 
---echo connection default;
 connection default;
 GRANT CREATE ON test.* TO test2@localhost;
 REVOKE DROP ON test.* FROM test2@localhost;
 
---echo connect (test2,localhost,test2,,test,MASTER_MYPORT,MASTER_MYSOCK);
 connect (test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
-USE test;
 SHOW GRANTS FOR CURRENT_USER;
 # Privilege for ALTER and SELECT
---error ER_TABLEACCESS_DENIED_ERROR
+error ER_TABLEACCESS_DENIED_ERROR;
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
---echo disconnect test2;
 disconnect test2;
  
---echo connection default;
 connection default;
 
---source suite/parts/inc/part_exch_drop_tabs.inc
+source suite/parts/inc/part_exch_drop_tabs.inc;
 
 DROP USER test2@localhost;