bzr push into mysql-trunk-bugfixing branch (mattias.jonsson:3409 to 3410)

[Mattias Jonsson]

 3410 Mattias Jonsson	2010-12-03 [merge]
      merge

    modified:
      mysql-test/r/partition_binlog.result
      mysql-test/t/partition_binlog.test
 3409 Mattias Jonsson	2010-12-03 [merge]
      merge

    added:
      mysql-test/r/partition_binlog.result
      mysql-test/t/partition_binlog.test
    modified:
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/sql_partition_admin.cc
=== modified file 'mysql-test/r/partition_binlog.result'
--- a/mysql-test/r/partition_binlog.result	2010-12-01 21:47:40 +0000
+++ b/mysql-test/r/partition_binlog.result	2010-12-03 13:05:33 +0000
@@ -41,13 +41,6 @@ ALTER TABLE t1 TRUNCATE PARTITION p0;
 ALTER TABLE t1 DROP PARTITION p0;
 show binlog events in 'master-bin.000001' from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(id INT)
-PARTITION BY RANGE (id)
-(PARTITION p0 VALUES LESS THAN (100),
-PARTITION pmax VALUES LESS THAN (MAXVALUE))
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1), (10), (100), (1000)
-master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; ALTER TABLE t1 ANALYZE PARTITION p0
 master-bin.000001	#	Query	#	#	use `test`; ALTER TABLE t1 OPTIMIZE PARTITION p0
 master-bin.000001	#	Query	#	#	use `test`; ALTER TABLE t1 REPAIR PARTITION p0

=== modified file 'mysql-test/t/partition_binlog.test'
--- a/mysql-test/t/partition_binlog.test	2010-12-01 21:47:40 +0000
+++ b/mysql-test/t/partition_binlog.test	2010-12-03 13:05:33 +0000
@@ -9,9 +9,6 @@ DROP TABLE IF EXISTS t1;
 --echo #            but the statement is written to binlog
 --echo #
 
---let $binlog_file=query_get_value(SHOW MASTER STATUS, File, 1)
---let $binlog_start=query_get_value(SHOW MASTER STATUS, Position, 1)
-
 CREATE TABLE t1(id INT)
 PARTITION BY RANGE (id)
 (PARTITION p0 VALUES LESS THAN (100),
@@ -19,6 +16,9 @@ PARTITION BY RANGE (id)
 
 INSERT INTO t1 VALUES (1), (10), (100), (1000);
 
+--let $binlog_file=query_get_value(SHOW MASTER STATUS, File, 1)
+--let $binlog_start=query_get_value(SHOW MASTER STATUS, Position, 1)
+
 --error ER_WRONG_PARTITION_NAME
 ALTER TABLE t1 TRUNCATE PARTITION p1;
 --error ER_DROP_PARTITION_NON_EXISTENT

No bundle (reason: useless for push emails).