Commit e54bd243 authored by unknown's avatar unknown
Browse files

Fix test results from merge, and fix the symlink test which had an 

out-of-sync test and result.


mysql-test/r/type_float.result:
  Warning message text changed
mysql-test/t/symlink.test:
  Re-enable part of test
mysql-test/r/symlink.result:
  Update results to match test
parent 2c41e592

mysql-test/r/symlink.result

+9 −0
Original line number Diff line number Diff line
@@ -45,6 +45,15 @@ alter table t9 rename t8, add column d int not null; 
alter table t8 rename t7;

rename table t7 to t9;

drop table t1;

SHOW CREATE TABLE t9;

Table	Create Table

t9	CREATE TABLE `t9` (

  `a` int(11) NOT NULL auto_increment,

  `b` char(16) NOT NULL,

  `c` int(11) NOT NULL,

  `d` int(11) NOT NULL,

  PRIMARY KEY  (`a`)

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

Got one of the listed errors

Got one of the listed errors

Got one of the listed errors

mysql-test/r/type_float.result

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ create table t1 (d1 double, d2 double unsigned); 
insert into t1 set d1 = -1.0;

update t1 set d2 = d1;

Warnings:

Warning	1264	Data truncated; out of range for column 'd2' at row 1

Warning	1264	Out of range value adjusted for column 'd2' at row 1

select * from t1;

d1	d2

-1	0

mysql-test/t/symlink.test

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ optimize table t9; 
repair table t9;

alter table t9 add column c int not null;



#--replace_result $MYSQL_TEST_DIR TEST_DIR

#show create table t9;

--replace_result $MYSQL_TEST_DIR TEST_DIR

show create table t9;



# Test renames

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