Commit 461f559a authored by df@pippilotta.erinye.com's avatar df@pippilotta.erinye.com
Browse files

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
parents 3b3be2ad 4ffcc4f2

mysql-test/r/alter_table.result

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ SHOW FULL COLUMNS FROM t1; 
Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

GROUP_ID	int(10) unsigned	NULL	NO	PRI	0		#	

LANG_ID	smallint(5) unsigned	NULL	NO	PRI	0		#	

NAME	char(80)	latin1_swedish_ci	NO	MUL			#	

NAME	char(80)	latin1_swedish_ci	NO	MUL	NULL		#	

DROP TABLE t1;

create table t1 (n int);

insert into t1 values(9),(3),(12),(10);

mysql-test/r/create.result

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ d date YES NULL 
e	varchar(1)	NO			

f	datetime	YES		NULL	

g	time	YES		NULL	

h	longblob	NO			

h	longblob	NO		NULL	

dd	time	YES		NULL	

select * from t2;

a	b	c	d	e	f	g	h	dd

mysql-test/r/ctype_collate.result

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

SHOW FIELDS FROM  t1;

Field	Type	Null	Key	Default	Extra

latin1_f	char(32)	NO			

latin1_f	char(32)	NO		NULL	

ALTER TABLE t1 CHANGE latin1_f 

latin1_f CHAR(32) CHARACTER SET latin1 COLLATE latin1_bin;

SHOW CREATE TABLE t1;

mysql-test/r/ctype_recoding.result

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ Table Create Table 
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT=' '

SHOW FIELDS FROM ;

Field	Type	Null	Key	Default	Extra

	char(32)	NO			

	char(32)	NO		NULL	

SET CHARACTER SET cp1251;

SHOW TABLES;

Tables_in_test
@@ -66,7 +66,7 @@ Table Create Table 
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT=' '

SHOW FIELDS FROM ;

Field	Type	Null	Key	Default	Extra

	char(32)	NO			

	char(32)	NO		NULL	

SET CHARACTER SET utf8;

SHOW TABLES;

Tables_in_test
@@ -78,7 +78,7 @@ Table Create Table 
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='комментарий таблицы'

SHOW FIELDS FROM таблица;

Field	Type	Null	Key	Default	Extra

поле	char(32)	NO			

поле	char(32)	NO		NULL	

SET CHARACTER SET koi8r;

DROP TABLE ;

SET CHARACTER SET default;

mysql-test/r/default.result

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ Warning 1364 Field 'd' doesn't have a default value 
desc bug20691;

Field	Type	Null	Key	Default	Extra

i	int(11)	YES		NULL	

d	datetime	NO			

d	datetime	NO		NULL	

dn	datetime	NO		0000-00-00 00:00:00	

insert into bug20691 values (3, DEFAULT, DEFAULT), (3, '1975-07-10 07:10:03', '1978-01-13 14:08:51'), (3, DEFAULT, DEFAULT);

Warnings: