*: fix auto increment type (pingcap#1262)

jackysp · May 26, 2016 · c9413d6 · c9413d6
1 parent 86fe54d
commit c9413d6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/ddl/ddl.go b/ddl/ddl.go
@@ -752,7 +752,8 @@ func (d *ddl) buildTableInfo(tableName model.CIStr, cols []*table.Column, constr
 					return nil, infoschema.ErrColumnNotExists.Gen("no such column: %v", key)
 				}
 				switch col.Tp {
-				case mysql.TypeLong, mysql.TypeLonglong:
+				case mysql.TypeLong, mysql.TypeLonglong,
+					mysql.TypeTiny, mysql.TypeShort, mysql.TypeInt24:
 					tbInfo.PKIsHandle = true
 					// Avoid creating index for PK handle column.
 					continue

diff --git a/session_test.go b/session_test.go
@@ -240,6 +240,7 @@ func (s *testSessionSuite) TestAutoIncrementID(c *C) {
 	defer testleak.AfterTest(c)()
 	store := newStore(c, s.dbName)
 	se := newSession(c, store, s.dbName)
+
 	mustExecSQL(c, se, "drop table if exists t")
 	mustExecSQL(c, se, "create table t (id BIGINT PRIMARY KEY AUTO_INCREMENT NOT NULL)")
 	mustExecSQL(c, se, "insert t values ()")
@@ -253,8 +254,13 @@ func (s *testSessionSuite) TestAutoIncrementID(c *C) {
 	mustExecSQL(c, se, "insert t () values ()")
 	c.Assert(se.LastInsertID(), Greater, lastID)
 	mustExecSQL(c, se, "insert t () select 100")
-	mustExecSQL(c, se, s.dropDBSQL)
 
+	mustExecSQL(c, se, "drop table if exists t")
+	mustExecSQL(c, se, "create table t (i tinyint unsigned not null auto_increment, primary key (i));")
+	mustExecSQL(c, se, "insert into t set i = 254;")
+	mustExecSQL(c, se, "insert t values ()")
+
+	mustExecSQL(c, se, s.dropDBSQL)
 	err := store.Close()
 	c.Assert(err, IsNil)
 }