bk commit into 5.0 tree (mskold:1.1866)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty 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
  1.1866 05/04/21 11:11:37 mskold@stripped +6 -0
  Disabled test for embedded

  mysql-test/t/ndb_read_multi_range.test
    1.4 05/04/21 11:11:17 mskold@stripped +1 -0
    Disabled test for embedded

  mysql-test/t/ndb_condition_pushdown.test
    1.11 05/04/21 11:11:17 mskold@stripped +1 -0
    Disabled test for embedded

  mysql-test/t/ndb_cache_multi2.test
    1.3 05/04/21 11:11:17 mskold@stripped +1 -0
    Disabled test for embedded

  mysql-test/t/ndb_cache_multi.test
    1.3 05/04/21 11:11:17 mskold@stripped +1 -0
    Disabled test for embedded

  mysql-test/t/ndb_cache2.test
    1.5 05/04/21 11:11:17 mskold@stripped +1 -0
    Disabled test for embedded

  mysql-test/t/ndb_bitfield.test
    1.2 05/04/21 11:11:17 mskold@stripped +1 -0
    Disabled test for embedded

# 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:	mskold
# Host:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-5.0

--- 1.2/mysql-test/t/ndb_cache_multi.test	Thu Dec 16 11:09:04 2004
+++ 1.3/mysql-test/t/ndb_cache_multi.test	Thu Apr 21 11:11:17 2005
@@ -1,6 +1,7 @@
 -- source include/have_query_cache.inc
 -- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 drop table if exists t1, t2;

--- 1.1/mysql-test/t/ndb_bitfield.test	Thu Dec 23 15:30:25 2004
+++ 1.2/mysql-test/t/ndb_bitfield.test	Thu Apr 21 11:11:17 2005
@@ -1,4 +1,5 @@
 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 drop table if exists t1;

--- 1.10/mysql-test/t/ndb_condition_pushdown.test	Mon Apr  4 21:37:42 2005
+++ 1.11/mysql-test/t/ndb_condition_pushdown.test	Thu Apr 21 11:11:17 2005
@@ -1,4 +1,5 @@
 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1,t2;

--- 1.4/mysql-test/t/ndb_cache2.test	Tue Mar 15 15:03:22 2005
+++ 1.5/mysql-test/t/ndb_cache2.test	Thu Apr 21 11:11:17 2005
@@ -1,5 +1,6 @@
 -- source include/have_query_cache.inc
 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 drop table if exists t1, t2, t3, t4, t5;

--- 1.2/mysql-test/t/ndb_cache_multi2.test	Mon Feb 21 11:45:48 2005
+++ 1.3/mysql-test/t/ndb_cache_multi2.test	Thu Apr 21 11:11:17 2005
@@ -1,6 +1,7 @@
 -- source include/have_query_cache.inc
 -- source include/have_ndb.inc
 -- source include/have_multi_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 drop table if exists t1, t2;

--- 1.3/mysql-test/t/ndb_read_multi_range.test	Wed Dec  1 12:43:28 2004
+++ 1.4/mysql-test/t/ndb_read_multi_range.test	Thu Apr 21 11:11:17 2005
@@ -1,4 +1,5 @@
 -- source include/have_ndb.inc
+-- source include/not_embedded.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1, r1;