diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-01-18 13:26:48 -0700 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-01-18 13:26:48 -0700 |
| commit | b8ae113892b327c63ac23b0fceef8cb82da24a87 (patch) | |
| tree | 8e934e4fe85739a58c1e464ed080cc117b433919 /mysql-test | |
| parent | d0cfcce458fd129086d402a8c98a21f651e0fd87 (diff) | |
| parent | 4fda992bff2034ff551d30cb5da742184ff4a3df (diff) | |
| download | mariadb-git-b8ae113892b327c63ac23b0fceef8cb82da24a87.tar.gz | |
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
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ndb_types.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/ndb_types.test | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/r/ndb_types.result b/mysql-test/r/ndb_types.result index 6938277f01d..ec2858d818a 100644 --- a/mysql-test/r/ndb_types.result +++ b/mysql-test/r/ndb_types.result @@ -73,3 +73,4 @@ select time_stamp>@now from t1; time_stamp>@now 1 drop table t1; +End of 4.1 tests diff --git a/mysql-test/t/ndb_types.test b/mysql-test/t/ndb_types.test index 10b8eb87e2c..ab18817132e 100644 --- a/mysql-test/t/ndb_types.test +++ b/mysql-test/t/ndb_types.test @@ -1,5 +1,5 @@ --- source include/have_ndb.inc --- source include/not_embedded.inc +--source include/have_ndb.inc +--source include/not_embedded.inc --disable_warnings DROP TABLE IF EXISTS t1; @@ -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 |