Commit e1fcd181 authored by msvensson@pilot.mysql.com's avatar msvensson@pilot.mysql.com
Browse files

Merge neptunus:mysql/mysql-4.1-maint 

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
parents da6773f9 09591de3

mysql-test/r/myisam.result

+1 −21
Original line number Diff line number Diff line
@@ -923,24 +923,4 @@ SET @@myisam_repair_threads=1; 
SHOW VARIABLES LIKE 'myisam_repair%';

Variable_name	Value

myisam_repair_threads	1

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

create table t1 (a int) engine=myisam select 42 a;

select * from t1;

a

9

select * from t1;

a

99

select * from t1;

a

42

drop table t1;
 
End of 4.1 tests

mysql-test/r/symlink.result

+22 −0
Original line number Diff line number Diff line
@@ -102,3 +102,25 @@ t1 CREATE TABLE `t1` ( 
  `i` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

create table t1 (a int) engine=myisam select 42 a;

select * from t1;

a

9

select * from t1;

a

99

select * from t1;

a

42

drop table t1;

End of 4.1 tests

mysql-test/r/type_ranges.result

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ ushort smallint(5) unsigned zerofill NULL MUL 00000 # 
umedium	mediumint(8) unsigned	NULL		MUL	0		#	

ulong	int(11) unsigned	NULL		MUL	0		#	

ulonglong	bigint(13) unsigned	NULL		MUL	0		#	

time_stamp	timestamp	NULL	YES		CURRENT_TIMESTAMP		#	

time_stamp	timestamp	NULL			CURRENT_TIMESTAMP		#	

date_field	date	NULL	YES		NULL		#	

time_field	time	NULL	YES		NULL		#	

date_time	datetime	NULL	YES		NULL		#
@@ -222,7 +222,7 @@ ushort smallint(5) unsigned zerofill NULL 00000 # 
umedium	mediumint(8) unsigned	NULL		MUL	0		#	

ulong	int(11) unsigned	NULL		MUL	0		#	

ulonglong	bigint(13) unsigned	NULL		MUL	0		#	

time_stamp	timestamp	NULL	YES		CURRENT_TIMESTAMP		#	

time_stamp	timestamp	NULL			CURRENT_TIMESTAMP		#	

date_field	varchar(10)	latin1_swedish_ci	YES		NULL		#	

time_field	time	NULL	YES		NULL		#	

date_time	datetime	NULL	YES		NULL		#
@@ -248,7 +248,7 @@ ushort smallint(5) unsigned zerofill NULL 00000 # 
umedium	mediumint(8) unsigned	NULL			0		#	

ulong	int(11) unsigned	NULL			0		#	

ulonglong	bigint(13) unsigned	NULL			0		#	

time_stamp	timestamp	NULL	YES		0000-00-00 00:00:00		#	

time_stamp	timestamp	NULL			0000-00-00 00:00:00		#	

date_field	varchar(10)	latin1_swedish_ci	YES		NULL		#	

time_field	time	NULL	YES		NULL		#	

date_time	datetime	NULL	YES		NULL		#

mysql-test/r/type_timestamp.result

+9 −9
Original line number Diff line number Diff line
@@ -188,9 +188,9 @@ t1 CREATE TABLE `t1` ( 
) ENGINE=MyISAM DEFAULT CHARSET=latin1

show columns from t1;

Field	Type	Null	Key	Default	Extra

t1	timestamp	YES		2003-01-01 00:00:00	

t1	timestamp			2003-01-01 00:00:00	

t2	datetime	YES		NULL	

t3	timestamp	YES		0000-00-00 00:00:00	

t3	timestamp			0000-00-00 00:00:00	

drop table t1;

create table t1 (t1 timestamp default now(), t2 datetime, t3 timestamp);

SET TIMESTAMP=1000000002;
@@ -212,9 +212,9 @@ t1 CREATE TABLE `t1` ( 
) ENGINE=MyISAM DEFAULT CHARSET=latin1

show columns from t1;

Field	Type	Null	Key	Default	Extra

t1	timestamp	YES		CURRENT_TIMESTAMP	

t1	timestamp			CURRENT_TIMESTAMP	

t2	datetime	YES		NULL	

t3	timestamp	YES		0000-00-00 00:00:00	

t3	timestamp			0000-00-00 00:00:00	

drop table t1;

create table t1 (t1 timestamp default '2003-01-01 00:00:00' on update now(), t2 datetime);

SET TIMESTAMP=1000000004;
@@ -238,7 +238,7 @@ t1 CREATE TABLE `t1` ( 
) ENGINE=MyISAM DEFAULT CHARSET=latin1

show columns from t1;

Field	Type	Null	Key	Default	Extra

t1	timestamp	YES		2003-01-01 00:00:00	

t1	timestamp			2003-01-01 00:00:00	

t2	datetime	YES		NULL	

drop table t1;

create table t1 (t1 timestamp default now() on update now(), t2 datetime);
@@ -263,7 +263,7 @@ t1 CREATE TABLE `t1` ( 
) ENGINE=MyISAM DEFAULT CHARSET=latin1

show columns from t1;

Field	Type	Null	Key	Default	Extra

t1	timestamp	YES		CURRENT_TIMESTAMP	

t1	timestamp			CURRENT_TIMESTAMP	

t2	datetime	YES		NULL	

drop table t1;

create table t1 (t1 timestamp, t2 datetime, t3 timestamp);
@@ -289,9 +289,9 @@ t1 CREATE TABLE `t1` ( 
) ENGINE=MyISAM DEFAULT CHARSET=latin1

show columns from t1;

Field	Type	Null	Key	Default	Extra

t1	timestamp	YES		CURRENT_TIMESTAMP	

t1	timestamp			CURRENT_TIMESTAMP	

t2	datetime	YES		NULL	

t3	timestamp	YES		0000-00-00 00:00:00	

t3	timestamp			0000-00-00 00:00:00	

drop table t1;

create table t1 (t1 timestamp default current_timestamp on update current_timestamp, t2 datetime);

SET TIMESTAMP=1000000009;
@@ -315,7 +315,7 @@ t1 CREATE TABLE `t1` ( 
) ENGINE=MyISAM DEFAULT CHARSET=latin1

show columns from t1;

Field	Type	Null	Key	Default	Extra

t1	timestamp	YES		CURRENT_TIMESTAMP	

t1	timestamp			CURRENT_TIMESTAMP	

t2	datetime	YES		NULL	

delete from t1;

insert into t1 values ('2004-04-01 00:00:00', '2004-04-01 00:00:00');

mysql-test/r/windows.result

+6 −0
Original line number Diff line number Diff line
@@ -6,3 +6,9 @@ use prn; 
ERROR 42000: Unknown database 'prn'

create table nu (a int);

drop table nu;

drop table if exists t1;

CREATE TABLE t1 ( `ID` int(6) ) data directory 'c:/tmp/' index directory 'c:/tmp/' engine=MyISAM;

Warnings:

Warning	0	DATA DIRECTORY option ignored

Warning	0	INDEX DIRECTORY option ignored

drop table t1;