Commit 66d4b40c authored by unknown's avatar unknown
Browse files

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  mysql.com:/home/mysql-4.1-19025e
parents 812a82ed d300ceea

mysql-test/r/auto_increment.result

+24 −0
Original line number Diff line number Diff line
@@ -355,3 +355,27 @@ CHECK TABLE t1; 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

DROP TABLE IF EXISTS t1;

CREATE TABLE `t1` (

t1_name VARCHAR(255) DEFAULT NULL,

t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,

KEY (t1_name),

PRIMARY KEY (t1_id)

) AUTO_INCREMENT = 1000;

INSERT INTO t1 (t1_name) VALUES('MySQL');

INSERT INTO t1 (t1_name) VALUES('MySQL');

INSERT INTO t1 (t1_name) VALUES('MySQL');

SELECT * from t1;

t1_name	t1_id

MySQL	1000

MySQL	1001

MySQL	1002

SHOW CREATE TABLE `t1`;

Table	Create Table

t1	CREATE TABLE `t1` (

  `t1_name` varchar(255) default NULL,

  `t1_id` int(10) unsigned NOT NULL auto_increment,

  PRIMARY KEY  (`t1_id`),

  KEY `t1_name` (`t1_name`)

) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1

DROP TABLE `t1`;

End of 4.1 tests

mysql-test/r/gis-rtree.result

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ t2 CREATE TABLE `t2` ( 
  `g` geometry NOT NULL default '',

  PRIMARY KEY  (`fid`),

  SPATIAL KEY `g` (`g`(32))

) ENGINE=MyISAM DEFAULT CHARSET=latin1

) ENGINE=MyISAM AUTO_INCREMENT=101 DEFAULT CHARSET=latin1

SELECT count(*) FROM t2;

count(*)

100

mysql-test/r/mysqldump.result

+38 −0
Original line number Diff line number Diff line
@@ -1503,3 +1503,41 @@ select * from t1; 
a	b

Osnabrck	Kln

drop table t1;

create table `t1` (

t1_name varchar(255) default null,

t1_id int(10) unsigned not null auto_increment,

key (t1_name),

primary key (t1_id)

) auto_increment = 1000 default charset=latin1;

insert into t1 (t1_name) values('bla');

insert into t1 (t1_name) values('bla');

insert into t1 (t1_name) values('bla');

select * from t1;

t1_name	t1_id

bla	1000

bla	1001

bla	1002

show create table `t1`;

Table	Create Table

t1	CREATE TABLE `t1` (

  `t1_name` varchar(255) default NULL,

  `t1_id` int(10) unsigned NOT NULL auto_increment,

  PRIMARY KEY  (`t1_id`),

  KEY `t1_name` (`t1_name`)

) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1

DROP TABLE `t1`;

select * from t1;

t1_name	t1_id

bla	1000

bla	1001

bla	1002

show create table `t1`;

Table	Create Table

t1	CREATE TABLE `t1` (

  `t1_name` varchar(255) default NULL,

  `t1_id` int(10) unsigned NOT NULL auto_increment,

  PRIMARY KEY  (`t1_id`),

  KEY `t1_name` (`t1_name`)

) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1

drop table `t1`;

End of 4.1 tests

mysql-test/r/symlink.result

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ t9 CREATE TABLE `t9` ( 
  `b` char(16) NOT NULL default '',

  `c` int(11) NOT NULL default '0',

  PRIMARY KEY  (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'

) ENGINE=MyISAM AUTO_INCREMENT=16725 DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'

alter table t9 rename t8, add column d int not null;

alter table t8 rename t7;

rename table t7 to t9;
@@ -62,7 +62,7 @@ t9 CREATE TABLE `t9` ( 
  `c` int(11) NOT NULL default '0',

  `d` int(11) NOT NULL default '0',

  PRIMARY KEY  (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'

) ENGINE=MyISAM AUTO_INCREMENT=16725 DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'

drop database mysqltest;

create table t1 (a int not null) engine=myisam;

show create table t1;

mysql-test/t/auto_increment.test

+20 −1
Original line number Diff line number Diff line
@@ -219,4 +219,23 @@ INSERT INTO t1 (b) VALUES ('bbbb'); 
CHECK TABLE t1;

DROP TABLE IF EXISTS t1;



# End of 4.1 tests
 
# BUG #19025:



CREATE TABLE `t1` (

    t1_name VARCHAR(255) DEFAULT NULL,

    t1_id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,

    KEY (t1_name),

    PRIMARY KEY (t1_id)

) AUTO_INCREMENT = 1000;



INSERT INTO t1 (t1_name) VALUES('MySQL');

INSERT INTO t1 (t1_name) VALUES('MySQL');

INSERT INTO t1 (t1_name) VALUES('MySQL');



SELECT * from t1;



SHOW CREATE TABLE `t1`;



DROP TABLE `t1`;



--echo End of 4.1 tests