bzr commit into mysql-6.0 branch (vvaintroub:2815)

[Vladislav Vaintroub]

#At file:///C:/bzr/mysql-6.0-bugteam/

 2815 Vladislav Vaintroub	2008-09-01 [merge]
      merge
modified:
  mysql-test/r/partition.result
  mysql-test/t/partition.test

=== modified file 'mysql-test/r/partition.result'
--- a/mysql-test/r/partition.result	2008-08-15 18:34:18 +0000
+++ b/mysql-test/r/partition.result	2008-09-01 11:42:44 +0000
@@ -1497,13 +1497,15 @@ create trigger t_ad after delete on t fo
 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 = default;
+SET GLOBAL general_log = @old_general_log_state;
 use test;
 create table t2 (b int);
 create table t1 (b int)

=== modified file 'mysql-test/t/partition.test'
--- a/mysql-test/t/partition.test	2008-08-15 18:34:18 +0000
+++ b/mysql-test/t/partition.test	2008-09-01 11:42:44 +0000
@@ -1635,13 +1635,15 @@ 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;
 --error ER_WRONG_USAGE
 ALTER TABLE general_log PARTITION BY RANGE (TO_DAYS(event_time))
   (PARTITION p0 VALUES LESS THAN (733144), PARTITION p1 VALUES LESS THAN (3000000));
 ALTER TABLE general_log ENGINE = CSV;
-SET GLOBAL general_log = default;
+SET GLOBAL general_log = @old_general_log_state;
 use test;
 
 #