database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
unknown
2007-01-18 13:26:48 -07:00
parent d0cfcce458 4fda992bff
commit b8ae113892
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/ndb_types.result
View File

@ -73,3 +73,4 @@ select time_stamp>@now from t1;
time_stamp>@now
1
drop table t1;
End of 4.1 tests

10
mysql-test/t/ndb_types.test
View File

@ -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