bzr push into mysql-5.1 branch (mattias.jonsson:2762 to 2763)

[Mattias Jonsson]

 2763 Mattias Jonsson	2008-10-06 [merge]
      merge
modified:
  mysql-test/r/partition.result
  mysql-test/t/partition.test

 2762 Matthias Leich	2008-10-04 [merge]
      Merge of fixes for Bug#36874,#38427,#37744,#38762
      with actual tree
removed:
  mysql-test/suite/funcs_1/r/memory_storedproc.result
  mysql-test/suite/funcs_1/r/myisam_storedproc.result
  mysql-test/suite/funcs_1/r/ndb_storedproc.result
  mysql-test/suite/funcs_1/t/innodb_storedproc.test
  mysql-test/suite/funcs_1/t/memory_storedproc.test
  mysql-test/suite/funcs_1/t/myisam_storedproc.test
  mysql-test/suite/funcs_1/t/ndb_storedproc.test
added:
  mysql-test/suite/funcs_1/storedproc/param_check.inc
renamed:
  mysql-test/suite/funcs_1/r/innodb_storedproc.result =>
mysql-test/suite/funcs_1/r/storedproc.result
  mysql-test/suite/funcs_1/storedproc/storedproc_master.inc =>
mysql-test/suite/funcs_1/t/storedproc.test
modified:
  mysql-test/r/federated_bug_25714.result
  mysql-test/r/slow_launch_time_func.result
  mysql-test/suite/funcs_1/views/func_view.inc
  mysql-test/t/federated_bug_25714.test
  mysql-test/t/slow_launch_time_func.test
  mysql-test/suite/funcs_1/r/storedproc.result
  mysql-test/suite/funcs_1/t/storedproc.test

=== modified file 'mysql-test/r/partition.result'
--- a/mysql-test/r/partition.result	2008-08-15 18:26:25 +0000
+++ b/mysql-test/r/partition.result	2008-09-01 11:25:19 +0000
@@ -1448,13 +1448,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:26:25 +0000
+++ b/mysql-test/t/partition.test	2008-09-01 11:25:19 +0000
@@ -1589,13 +1589,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;
 
 #