Commit 3e519c45 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.0 

into  mysql.com:/home/mydev/mysql-5.0-5000


mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/sql_mode.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 0d7a2fb8 a3c014ca

mysql-test/r/merge.result

+3 −3
Original line number Diff line number Diff line
@@ -669,15 +669,15 @@ b varchar(10), 
index (a,b)

) engine=myisam;

insert into t2 values ( null, '');

insert into t2 values ( 9999999999.9999, '');

insert into t2 values ( 9999999999.999, '');

insert into t3 select * from t2;

select min(a), max(a) from t1;

min(a)	max(a)

9999999999.9999	9999999999.9999

9999999999.9990	9999999999.9990

flush tables;

select min(a), max(a) from t1;

min(a)	max(a)

9999999999.9999	9999999999.9999

9999999999.9990	9999999999.9990

drop table t1, t2, t3;

create table t1 (a int,b int,c int, index (a,b,c));

create table t2 (a int,b int,c int, index (a,b,c));

mysql-test/t/merge.test

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ create table t3 ( 
) engine=myisam;



insert into t2 values ( null, '');

insert into t2 values ( 9999999999.9999, '');

insert into t2 values ( 9999999999.999, '');

insert into t3 select * from t2;

select min(a), max(a) from t1;

flush tables;