bk commit into 6.0 tree (chris:1.2683) 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 17:34:23-05:00, chris@stripped +3 -0
  Bug #22564, "auto_increment column gets automatically incremented"
  - Changed testcases using multipart keys with autoincrement columns to put the autoincrement column first.

  mysql-test/suite/falcon/r/falcon_bug_31490.result@stripped, 2007-11-02 17:34:21-05:00, chris@stripped +0 -1
    Removed extra blank line

  mysql-test/suite/falcon/r/falcon_bugs.result@stripped, 2007-11-02 17:34:21-05:00, chris@stripped +8 -8
    Changed testcases using multipart keys with autoincrement columns to put the autoincrement column first.

  mysql-test/suite/falcon/t/falcon_bugs.test@stripped, 2007-11-02 17:34:21-05:00, chris@stripped +7 -7
    Changed testcases using multipart keys with autoincrement columns to put the autoincrement column first.

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_31490.result b/mysql-test/suite/falcon/r/falcon_bug_31490.result
--- a/mysql-test/suite/falcon/r/falcon_bug_31490.result	2007-10-26 10:23:29 -05:00
+++ b/mysql-test/suite/falcon/r/falcon_bug_31490.result	2007-11-02 17:34:21 -05:00
@@ -51,4 +51,3 @@ id	select_id	my_datetime
 20	NULL	0007-01-01 00:00:00
 21	NULL	0008-01-01 00:00:00
 DROP TABLE t1_values;
-
diff -Nrup a/mysql-test/suite/falcon/r/falcon_bugs.result b/mysql-test/suite/falcon/r/falcon_bugs.result
--- a/mysql-test/suite/falcon/r/falcon_bugs.result	2007-10-05 01:42:50 -05:00
+++ b/mysql-test/suite/falcon/r/falcon_bugs.result	2007-11-02 17:34:21 -05:00
@@ -53,7 +53,7 @@ SET @@storage_engine = Falcon;
 create table t1 (
 a char(10) not null, 
 b int not null auto_increment, 
-primary key(a,b)
+primary key(b,a)
 );
 drop table t1;
 *** Bug #87 ***
@@ -700,15 +700,15 @@ 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;
 *** Bug #206 ***
 SET @@storage_engine = Falcon;
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bugs.test b/mysql-test/suite/falcon/t/falcon_bugs.test
--- a/mysql-test/suite/falcon/t/falcon_bugs.test	2007-10-05 07:21:27 -05:00
+++ b/mysql-test/suite/falcon/t/falcon_bugs.test	2007-11-02 17:34:21 -05:00
@@ -116,7 +116,7 @@ SET @@storage_engine = Falcon;
 create table t1 (
   a char(10) not null, 
   b int not null auto_increment, 
-  primary key(a,b)
+  primary key(b,a)
 );
 
 # Final cleanup.
@@ -993,16 +993,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');
 --enable_abort_on_error
 
 # Final cleanup.