bk commit into 5.0 tree (tsmith:1.2377)

[tim]

Below is the list of changes that have just been committed into a local
5.0 repository of tsmith. When tsmith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-18 13:26:48-07:00, tsmith@stripped +2 -0
  Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
  into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
  MERGE: 1.1616.2876.50

  mysql-test/r/ndb_types.result@stripped, 2007-01-18 13:26:44-07:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.2.1.1

  mysql-test/t/ndb_types.test@stripped, 2007-01-18 13:26:44-07:00, tsmith@stripped +0 -0
    Auto merged
    MERGE: 1.2.1.3

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	siva.hindu.god
# Root:	/home/tsmith/m/bk/mrg-jan17/maint/50/RESYNC

--- 1.4/mysql-test/r/ndb_types.result	2005-10-13 08:12:30 -06:00
+++ 1.5/mysql-test/r/ndb_types.result	2007-01-18 13:26:44 -07:00
@@ -73,3 +73,4 @@
 time_stamp>@now
 1
 drop table t1;
+End of 4.1 tests

--- 1.6/mysql-test/t/ndb_types.test	2005-10-13 08:11:45 -06:00
+++ 1.7/mysql-test/t/ndb_types.test	2007-01-18 13:26:44 -07:00
@@ -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 @@
 );
 
 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 @@
 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 @@
 
 drop table t1;
 
-# End of 4.1 tests
+--echo End of 4.1 tests