Test case clean up: Move test cases that depend on the CSV storage

engine to the partition_csv test. Also remove test case that was
duplicated. Fix connection procedure with the embedded server.

mysql-test/r/partition.result:
  Update test case result.
mysql-test/r/partition_csv.result:
  Update test case result.
mysql-test/t/partition.test:
  Move test cases to the partition_csv test.
mysql-test/t/partition_csv.test:
  Move tests from partition.test and remove duplicate.
  Tweaky connection procedure to work with embedded.

1 files changed, 0 insertions, 47 deletions

diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index c6d2db89ccd..8b95f4e7e12 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -1,4 +1,3 @@
-SET @old_general_log= @@global.general_log;
 drop table if exists t1, t2;
 CREATE TABLE t1 (a INT, FOREIGN KEY (a) REFERENCES t0 (a))
 ENGINE=MyISAM
@@ -1627,17 +1626,6 @@ create table t (s1 int) engine=myisam partition by key (s1);
 create trigger t_ad after delete on t for each row insert into t values (old.s1);
 insert into t values (1);
 drop table t;
-USE mysql;
-TRUNCATE TABLE general_log;
-SET @old_general_log_state = @@global.general_log;
-SET GLOBAL general_log = 0;
-ALTER TABLE general_log ENGINE = MyISAM;
-ALTER TABLE general_log PARTITION BY RANGE (TO_DAYS(event_time))
-(PARTITION p0 VALUES LESS THAN (733144), PARTITION p1 VALUES LESS THAN (3000000));
-ERROR HY000: Incorrect usage of PARTITION and log table
-ALTER TABLE general_log ENGINE = CSV;
-SET GLOBAL general_log = @old_general_log_state;
-use test;
 create table t2 (b int);
 create table t1 (b int)
 PARTITION BY RANGE (t2.b) (
@@ -1997,39 +1985,4 @@ CREATE TABLE t1(id INT,KEY(id)) ENGINE=MYISAM
 PARTITION BY HASH(id) PARTITIONS 2;
 DROP TABLE t1;
 SET SESSION SQL_MODE=DEFAULT;
-
-Bug#40281: partitioning the general log table crashes the server
-
---- set up partitioned log, and switch to it
-USE mysql;
-SET GLOBAL general_log =0;
-CREATE TABLE gl_partitioned LIKE general_log;
-ALTER TABLE gl_partitioned ENGINE=myisam;
-ALTER TABLE gl_partitioned PARTITION BY HASH (thread_id) PARTITIONS 10;
-ALTER TABLE general_log RENAME TO gl_nonpartitioned;
-ALTER TABLE gl_partitioned RENAME TO general_log;
-SELECT @@global.log_output INTO @old_glo;
-SET GLOBAL log_output='table';
-SET GLOBAL general_log =1;
---- do some things to be logged to partitioned log, should fail
-USE /* 1 */ test;
-CREATE TABLE t1 (i INT);
-INSERT INTO t1 VALUES (1);
-SELECT * FROM t1;
-i
-1
-USE mysql;
-SET GLOBAL general_log =0;
-ALTER TABLE general_log RENAME TO gl_partitioned;
-ALTER TABLE gl_nonpartitioned RENAME TO general_log;
---- show whether we actually logged anything (no) to general_log
-SELECT COUNT(argument) FROM gl_partitioned;
-COUNT(argument)
-0
-DROP TABLE gl_partitioned;
-SET GLOBAL log_output=@old_glo;
-SET GLOBAL general_log =1;
-USE /* 2 */ test;
-DROP TABLE t1;
 End of 5.1 tests
-SET @@global.general_log= @old_general_log;