Commit f31cb5dd authored by unknown's avatar unknown
Browse files

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/ansi.result:
  Merged from 4.1
mysql-test/r/auto_increment.result:
  Merged from 4.1
mysql-test/r/mysqldump.result:
  Merged from 4.1
mysql-test/r/symlink.result:
  Merged from 4.1
mysql-test/t/auto_increment.test:
  Merged from 4.1
mysql-test/t/mysqldump.test:
  Merged from 4.1
sql/set_var.cc:
  Merged from 4.1
sql/sql_show.cc:
  Merged from 4.1
parents 8570020c ac941700

mysql-test/r/ansi.result

+30 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ drop table if exists t1; 
set sql_mode="MySQL40";

select @@sql_mode;

@@sql_mode

NO_FIELD_OPTIONS,MYSQL40,HIGH_NOT_PRECEDENCE

MYSQL40,HIGH_NOT_PRECEDENCE

set @@sql_mode="ANSI";

select @@sql_mode;

@@sql_mode
@@ -17,3 +17,32 @@ SELECT id FROM t1 GROUP BY id2; 
id

drop table t1;

SET @@SQL_MODE="";

CREATE TABLE t1 (i int auto_increment NOT NULL, PRIMARY KEY (i));

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) NOT NULL auto_increment,

  PRIMARY KEY  (`i`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SET @@SQL_MODE="MYSQL323";

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) NOT NULL auto_increment,

  PRIMARY KEY  (`i`)

) TYPE=MyISAM

SET @@SQL_MODE="MYSQL40";

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) NOT NULL auto_increment,

  PRIMARY KEY  (`i`)

) TYPE=MyISAM

SET @@SQL_MODE="NO_FIELD_OPTIONS";

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `i` int(11) NOT NULL,

  PRIMARY KEY  (`i`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE t1;

mysql-test/r/auto_increment.result

+24 −0
Original line number Diff line number Diff line
@@ -355,6 +355,30 @@ 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

CREATE TABLE t1 ( `a` int(11) NOT NULL auto_increment, `b` int(11) default NULL,PRIMARY KEY  (`a`),UNIQUE KEY `b` (`b`));

insert into t1 (b) values (1);

replace into t1 (b) values (2), (1), (3);

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,

  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
@@ -1700,6 +1700,44 @@ 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

create table t1(a int);

create view v1 as select * from t1;

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,

  `c` int(11) NOT NULL,

  PRIMARY KEY  (`a`)

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

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

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

alter table t8 rename t7;

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

  `d` int(11) NOT NULL,

  PRIMARY KEY  (`a`)

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

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

drop database mysqltest;

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

show create table t1;