bk commit into 5.1 tree (jonas:1.2199)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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.2199 06/06/22 13:53:02 jonas@stripped +2 -0
  fix result file for ndb_dd_ddl

  mysql-test/t/ndb_dd_ddl.test
    1.10 06/06/22 13:52:58 jonas@stripped +2 -0
    fix so that result file is not dependant on local filesystem

  mysql-test/r/ndb_dd_ddl.result
    1.11 06/06/22 13:52:58 jonas@stripped +2 -2
    fix so that result file is not dependant on local filesystem

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work

--- 1.10/mysql-test/r/ndb_dd_ddl.result	2006-06-22 10:24:40 +02:00
+++ 1.11/mysql-test/r/ndb_dd_ddl.result	2006-06-22 13:52:58 +02:00
@@ -200,14 +200,14 @@ DROP LOGFILE GROUP lg1
 ENGINE NDB;
 **** End = And No =  ****
 create table t1 (a int primary key) engine = myisam;
-create logfile group lg1 add undofile '/home/jonas/src/51-work/mysql-test/var/master-data/test/t1.frm' initial_size 1M undo_buffer_size = 1M engine=ndb;;
+create logfile group lg1 add undofile 'MYSQLTEST_VARDIR/master-data/test/t1.frm' initial_size 1M undo_buffer_size = 1M engine=ndb;;
 ERROR HY000: Failed to create UNDOFILE
 create logfile group lg1
 add undofile 'undofile.dat'
 initial_size 1M
 undo_buffer_size = 1M
 engine=ndb;
-create tablespace ts1 add datafile '/home/jonas/src/51-work/mysql-test/var/master-data/test/t1.frm' use logfile group lg1 initial_size 1M engine ndb;;
+create tablespace ts1 add datafile 'MYSQLTEST_VARDIR/master-data/test/t1.frm' use logfile group lg1 initial_size 1M engine ndb;;
 ERROR HY000: Failed to create DATAFILE
 drop tablespace ts1
 engine ndb;

--- 1.9/mysql-test/t/ndb_dd_ddl.test	2006-06-22 10:24:40 +02:00
+++ 1.10/mysql-test/t/ndb_dd_ddl.test	2006-06-22 13:52:58 +02:00
@@ -302,6 +302,7 @@ ENGINE NDB;
 # bug#16341
 create table t1 (a int primary key) engine = myisam;
 
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --error ER_CREATE_FILEGROUP_FAILED
 --eval create logfile group lg1 add undofile '$MYSQLTEST_VARDIR/master-data/test/t1.frm' initial_size 1M undo_buffer_size = 1M engine=ndb;
 
@@ -311,6 +312,7 @@ initial_size 1M
 undo_buffer_size = 1M
 engine=ndb;
 
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --error ER_CREATE_FILEGROUP_FAILED
 --eval create tablespace ts1 add datafile '$MYSQLTEST_VARDIR/master-data/test/t1.frm' use logfile group lg1 initial_size 1M engine ndb;