Commit b8ae1138 authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41 

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


mysql-test/r/ndb_types.result:
  Auto merged
mysql-test/t/ndb_types.test:
  Auto merged
parents d0cfcce4 4fda992b

mysql-test/r/ndb_types.result

+1 −0
Original line number Diff line number Diff line
@@ -73,3 +73,4 @@ select time_stamp>@now from t1; 
time_stamp>@now

1

drop table t1;

End of 4.1 tests

mysql-test/t/ndb_types.test

+5 −5
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ CREATE TABLE t1 ( 
);



set @now = now();

sleep 1;

--sleep 1.5

insert into t1 

(string,vstring,bin,vbin,tiny,short,medium,long_int,longlong,

 real_float,real_double, real_decimal,utiny, ushort, umedium,ulong,ulonglong,
@@ -66,7 +66,7 @@ from t1; 
select time_stamp>@now from t1;



set @now = now();

sleep 1;

--sleep 1.5

update t1 set string="bbbb",vstring="bbbb",bin=0xBBBB,vbin=0xBBBB,

tiny=-2,short=-2,medium=-2,long_int=-2,longlong=-2,real_float=2.2,

real_double=2.2,real_decimal=2.2,utiny=2,ushort=2,umedium=2,ulong=2,
@@ -82,4 +82,4 @@ select time_stamp>@now from t1; 


drop table t1;



# End of 4.1 tests
 
--echo End of 4.1 tests