From: Tor Didriksen
Date: July 22 2011 9:32am
Subject: bzr push into mysql-trunk branch (tor.didriksen:3291 to 3292) Bug#12532830
List-Archive: http://lists.mysql.com/commits/140427
X-Bug: 12532830
Message-Id: <201107220932.p6M9WieD005577@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3292 Tor Didriksen	2011-07-22
      Bug#12532830 post-push fix: windows case sensitivity ....

    modified:
      mysql-test/suite/innodb/r/innodb_bug54044.result
      mysql-test/suite/innodb/t/innodb_bug54044.test
 3291 Sunanda Menon	2011-07-22 [merge]
      Bug #12561297: Added the MySQL embedded binary

    modified:
      support-files/mysql.spec.sh
=== modified file 'mysql-test/suite/innodb/r/innodb_bug54044.result'
--- a/mysql-test/suite/innodb/r/innodb_bug54044.result	2011-07-21 15:11:09 +0000
+++ b/mysql-test/suite/innodb/r/innodb_bug54044.result	2011-07-22 09:32:04 +0000
@@ -6,7 +6,7 @@ table_54044	CREATE TEMPORARY TABLE `tabl
   `IF(NULL  IS NOT NULL, NULL, NULL)` binary(0) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 DROP TABLE table_54044;
-CREATE TABLE TMP ENGINE = INNODB AS SELECT COALESCE(NULL, NULL, NULL);
-ERROR HY000: Can't create table 'test.TMP' (errno: -1)
-CREATE TABLE TMP ENGINE = INNODB AS SELECT GREATEST(NULL, NULL);
-ERROR HY000: Can't create table 'test.TMP' (errno: -1)
+CREATE TABLE tmp ENGINE = INNODB AS SELECT COALESCE(NULL, NULL, NULL);
+ERROR HY000: Can't create table 'test.tmp' (errno: -1)
+CREATE TABLE tmp ENGINE = INNODB AS SELECT GREATEST(NULL, NULL);
+ERROR HY000: Can't create table 'test.tmp' (errno: -1)

=== modified file 'mysql-test/suite/innodb/t/innodb_bug54044.test'
--- a/mysql-test/suite/innodb/t/innodb_bug54044.test	2011-07-21 15:11:09 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug54044.test	2011-07-22 09:32:04 +0000
@@ -14,6 +14,6 @@ DROP TABLE table_54044;
 # using NULL datatype
 
 --error ER_CANT_CREATE_TABLE
-CREATE TABLE TMP ENGINE = INNODB AS SELECT COALESCE(NULL, NULL, NULL);
+CREATE TABLE tmp ENGINE = INNODB AS SELECT COALESCE(NULL, NULL, NULL);
 --error ER_CANT_CREATE_TABLE
-CREATE TABLE TMP ENGINE = INNODB AS SELECT GREATEST(NULL, NULL);
+CREATE TABLE tmp ENGINE = INNODB AS SELECT GREATEST(NULL, NULL);

No bundle (reason: useless for push emails).