Merge chilla.local:/home/mydev/mysql-5.1-amain

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/sql_partition.cc:
  Auto merged

mysql-test/r/rpl_partition.result

@@ -10,31 +10,9 @@ select @@global.binlog_format, @@session.binlog_format;
 @@global.binlog_format	ROW
 @@session.binlog_format	ROW
 DROP TABLE IF EXISTS t1, t2, t3;
-Warnings:
-Level	Note
-Code	1051
-Message	Unknown table 't1'
-Level	Note
-Code	1051
-Message	Unknown table 't2'
-Level	Note
-Code	1051
-Message	Unknown table 't3'
 DROP PROCEDURE IF EXISTS p1;
-Warnings:
-Level	Note
-Code	1305
-Message	PROCEDURE p1 does not exist
 DROP PROCEDURE IF EXISTS p2;
-Warnings:
-Level	Note
-Code	1305
-Message	PROCEDURE p2 does not exist
 DROP PROCEDURE IF EXISTS p3;
-Warnings:
-Level	Note
-Code	1305
-Message	PROCEDURE p3 does not exist
 CREATE TABLE t1(id MEDIUMINT NOT NULL AUTO_INCREMENT,
 dt TIMESTAMP, user CHAR(255), uuidf LONGBLOB,
 fkid MEDIUMINT, filler VARCHAR(255),

mysql-test/t/ctype_uca.test

@@ -530,7 +530,7 @@ create table t1 (
   a varchar(255),
   key a(a)
 ) character set utf8 collate utf8_czech_ci;
--- In Czech 'ch' is a single letter between 'h' and 'i'
+# In Czech 'ch' is a single letter between 'h' and 'i'
 insert into t1 values
 ('b'),('c'),('d'),('e'),('f'),('g'),('h'),('ch'),('i'),('j');
 select * from t1 where a like 'c%';

mysql-test/t/rpl_partition.test

@@ -9,12 +9,12 @@ SET GLOBAL binlog_format = 'ROW';
 SET SESSION binlog_format = 'ROW';
 select @@global.binlog_format, @@session.binlog_format;
 
---disable-warnings
+--disable_warnings
 DROP TABLE IF EXISTS t1, t2, t3;
 DROP PROCEDURE IF EXISTS p1;
 DROP PROCEDURE IF EXISTS p2;
 DROP PROCEDURE IF EXISTS p3;
---enable-warnings
+--enable_warnings
 
 eval CREATE TABLE t1(id MEDIUMINT NOT NULL AUTO_INCREMENT,
                            dt TIMESTAMP, user CHAR(255), uuidf LONGBLOB,

mysql-test/t/subselect.test

@@ -2970,7 +2970,7 @@ DROP TABLE t1,t2;
 CREATE TABLE t1 (a INT, b INT);
 INSERT INTO t1 VALUES (1, 2), (1,3), (1,4), (2,1), (2,2);
 
--- returns no rows, when it should
+# returns no rows, when it should
 SELECT a1.a, COUNT(*) FROM t1 a1 WHERE a1.a = 1
 AND EXISTS( SELECT a2.a FROM t1 a2 WHERE a2.a = a1.a)
 GROUP BY a1.a;