bk commit into 6.0 tree (chris:1.2682) BUG#22564

[cpowers]

Below is the list of changes that have just been committed into a local
6.0 repository of cpowers. When cpowers does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-02 16:12:40-05:00, chris@stripped +2 -0
  Bug #22564, "auto_increment column gets automatically incremented"
  - Adjusted testcase falcon_bug_28052.test to conform to the restriction that 
    autoincrement columns must be the first part of a multi-part key.

  mysql-test/suite/falcon/r/falcon_bug_28052.result@stripped, 2007-11-02 16:12:38-05:00,
chris@stripped +7 -7
    Reordered columns in key definition so that autoincrement column is first.

  mysql-test/suite/falcon/t/falcon_bug_28052.test@stripped, 2007-11-02 16:12:38-05:00,
chris@stripped +6 -6
    Reordered columns in key definition so that autoincrement column is first.

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_28052.result
b/mysql-test/suite/falcon/r/falcon_bug_28052.result
--- a/mysql-test/suite/falcon/r/falcon_bug_28052.result	2007-09-20 10:43:13 -05:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_28052.result	2007-11-02 16:12:38 -05:00
@@ -4,13 +4,13 @@ DROP TABLE IF EXISTS t1;
 CREATE TABLE t1(
 Month date NOT NULL,
 Type tinyint(3) unsigned NOT NULL auto_increment,
-UNIQUE KEY Month (Month,Type)
+UNIQUE KEY Month (Type, Month)
 ) ;
 INSERT INTO t1 VALUES
-('2003-09-01', 1),
-('2003-09-01', 1),
-('2003-09-01', 2),
-('2003-09-01', 2),
-('2003-09-01', 3);
-ERROR 23000: Duplicate entry '2003-09-01-1' for key 'Month'
+(1, '2003-09-01'),
+(1, '2003-09-01'),
+(2, '2003-09-01'),
+(2, '2003-09-01'),
+(3, '2003-09-01');
+ERROR 23000: Duplicate entry '255-0000-00-00' for key 'Month'
 DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_28052.test
b/mysql-test/suite/falcon/t/falcon_bug_28052.test
--- a/mysql-test/suite/falcon/t/falcon_bug_28052.test	2007-09-28 23:30:37 -05:00
+++ b/mysql-test/suite/falcon/t/falcon_bug_28052.test	2007-11-02 16:12:38 -05:00
@@ -11,16 +11,16 @@ DROP TABLE IF EXISTS t1;
 CREATE TABLE t1(
  Month date NOT NULL,
  Type tinyint(3) unsigned NOT NULL auto_increment,
- UNIQUE KEY Month (Month,Type)
+ UNIQUE KEY Month (Type, Month)
 ) ; 
 
 --disable_abort_on_error
 INSERT INTO t1 VALUES
-('2003-09-01', 1),
-('2003-09-01', 1),
-('2003-09-01', 2),
-('2003-09-01', 2),
-('2003-09-01', 3);
+(1, '2003-09-01'),
+(1, '2003-09-01'),
+(2, '2003-09-01'),
+(2, '2003-09-01'),
+(3, '2003-09-01');
 
 # Final cleanup
 DROP TABLE t1;