From: Nisha Gopalakrishnan
Date: October 15 2012 5:00am
Subject: bzr push into mysql-5.6 branch (nisha.gopalakrishnan:4452 to 4453)
 Bug#13840553
List-Archive: http://lists.mysql.com/commits/145030
X-Bug: 13840553
Message-Id: <201210150500.q9F50dPw029388@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4453 Nisha Gopalakrishnan	2012-10-15
      Bug#13840553: MYSQL MUST IMPROVE ERROR MESSAGES 
      
      Follow-up patch to fix test case failure. 

    modified:
      mysql-test/suite/parts/r/partition_basic_symlink_innodb.result
      mysql-test/suite/parts/t/partition_basic_symlink_innodb.test
 4452 Krunal Bauskar	2012-10-15 [merge]
      Merge from mysql-5.5

    added:
      mysql-test/suite/innodb/r/innodb_bug14704286.result
      mysql-test/suite/innodb/t/innodb_bug14704286.test
    modified:
      storage/innobase/row/row0sel.cc
=== modified file 'mysql-test/suite/parts/r/partition_basic_symlink_innodb.result'
--- a/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result	2012-06-15 15:32:44 +0000
+++ b/mysql-test/suite/parts/r/partition_basic_symlink_innodb.result	2012-10-15 04:45:05 +0000
@@ -16,12 +16,12 @@ PARTITION p1
 DATA DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-data-dir'
     INDEX DIRECTORY = 'MYSQLTEST_VARDIR/mysql-test-idx-dir'
 );
-ERROR HY000: Got error 140 from storage engine
+ERROR HY000: Table storage engine for 't1' doesn't have this option
 SHOW WARNINGS;
 Level	Code	Message
 Warning	1478	InnoDB: DATA DIRECTORY requires innodb_file_per_table.
 Warning	1478	InnoDB: INDEX DIRECTORY is not supported
-Error	1030	Got error 140 from storage engine
+Error	1031	Table storage engine for 't1' doesn't have this option
 Error	6	Error on delete of 'MYSQLD_DATADIR/test/t1.par' (Errcode: 2 - No such file or directory)
 #
 # InnoDB is different from MyISAM in that it uses a text file

=== modified file 'mysql-test/suite/parts/t/partition_basic_symlink_innodb.test'
--- a/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test	2012-06-15 15:32:44 +0000
+++ b/mysql-test/suite/parts/t/partition_basic_symlink_innodb.test	2012-10-15 04:45:05 +0000
@@ -61,7 +61,7 @@ SET SESSION innodb_strict_mode = ON;
 --echo #
 SET GLOBAL innodb_file_per_table = OFF;
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---error ER_GET_ERRNO
+--error ER_ILLEGAL_HA
 eval CREATE TABLE t1 (c1 INT)  ENGINE = InnoDB
 PARTITION BY HASH (c1) (
   PARTITION p0

No bundle (reason: useless for push emails).