diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-06-22 13:53:02 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-06-22 13:53:02 +0200 |
| commit | c56f8803306412a2768cf3363bbdc903a3e4bd31 (patch) | |
| tree | 741ca8d6cc006e1822e2814698b36ce0bdf38d56 | |
| parent | 8751d63e3aceeb90d3d8874e3766a0f11aa769ce (diff) | |
| download | mariadb-git-c56f8803306412a2768cf3363bbdc903a3e4bd31.tar.gz | |
fix result file for ndb_dd_ddl
mysql-test/r/ndb_dd_ddl.result:
fix so that result file is not dependant on local filesystem
mysql-test/t/ndb_dd_ddl.test:
fix so that result file is not dependant on local filesystem
| -rw-r--r-- | mysql-test/r/ndb_dd_ddl.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/ndb_dd_ddl.test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/ndb_dd_ddl.result b/mysql-test/r/ndb_dd_ddl.result index 71f42974929..9fff9f06f2a 100644 --- a/mysql-test/r/ndb_dd_ddl.result +++ b/mysql-test/r/ndb_dd_ddl.result @@ -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; diff --git a/mysql-test/t/ndb_dd_ddl.test b/mysql-test/t/ndb_dd_ddl.test index 2a0755c2748..95ad7f0d152 100644 --- a/mysql-test/t/ndb_dd_ddl.test +++ b/mysql-test/t/ndb_dd_ddl.test @@ -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; |