diff options
| author | unknown <joerg@trift2.> | 2007-08-24 12:28:47 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-08-24 12:28:47 +0200 |
| commit | fa91482f61768bbc9009058674c2458e884bb499 (patch) | |
| tree | ca9288e02ecbc852f4223f8589dffc5d0bf1938f /mysql-test/suite | |
| parent | 420c80dd817d5c2c3974844de4d2dd1f5ddc8f79 (diff) | |
| parent | a59096c5547d65ca120abfafc84efe9b4c8e5690 (diff) | |
| download | mariadb-git-fa91482f61768bbc9009058674c2458e884bb499.tar.gz | |
Merge trift2.:/MySQL/M51/tmp-5.1
into trift2.:/MySQL/M51/push-5.1
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
Auto merged
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/ndb/r/ndb_dd_ddl.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/ndb/t/ndb_dd_ddl.test | 17 |
2 files changed, 14 insertions, 9 deletions
diff --git a/mysql-test/suite/ndb/r/ndb_dd_ddl.result b/mysql-test/suite/ndb/r/ndb_dd_ddl.result index 33536038b1b..d065edfee5d 100644 --- a/mysql-test/suite/ndb/r/ndb_dd_ddl.result +++ b/mysql-test/suite/ndb/r/ndb_dd_ddl.result @@ -222,19 +222,17 @@ ENGINE NDB; DROP LOGFILE GROUP lg1 ENGINE NDB; **** End = And No = **** -create table t1 (a int primary key) engine = myisam; -create logfile group lg1 add undofile 'MYSQLTEST_VARDIR/master-data/test/t1.frm' initial_size 1M undo_buffer_size = 1M engine=ndb;; +create logfile group lg1 add undofile 'MYSQLTEST_VARDIR/tmp/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 'MYSQLTEST_VARDIR/master-data/test/t1.frm' use logfile group lg1 initial_size 1M engine ndb;; +create tablespace ts1 add datafile 'MYSQLTEST_VARDIR/tmp/t1.frm' use logfile group lg1 initial_size 1M engine ndb;; ERROR HY000: Failed to create DATAFILE drop tablespace ts1 engine ndb; ERROR HY000: Failed to drop TABLESPACE drop logfile group lg1 engine ndb; -drop table t1; diff --git a/mysql-test/suite/ndb/t/ndb_dd_ddl.test b/mysql-test/suite/ndb/t/ndb_dd_ddl.test index aa692385b07..d6de7c45326 100644 --- a/mysql-test/suite/ndb/t/ndb_dd_ddl.test +++ b/mysql-test/suite/ndb/t/ndb_dd_ddl.test @@ -333,11 +333,18 @@ ENGINE NDB; ### # # bug#16341 -create table t1 (a int primary key) engine = myisam; +#create table t1 (a int primary key) engine = myisam; +# 2007-08-22 Jeb +# Removed the use of create table and manually +# created the file to cause failure due to +# inconsistant results on other OS +# see #bug30559 + +--exec touch $MYSQLTEST_VARDIR/tmp/t1.frm --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; +--eval create logfile group lg1 add undofile '$MYSQLTEST_VARDIR/tmp/t1.frm' initial_size 1M undo_buffer_size = 1M engine=ndb; create logfile group lg1 add undofile 'undofile.dat' @@ -347,7 +354,7 @@ 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; +--eval create tablespace ts1 add datafile '$MYSQLTEST_VARDIR/tmp/t1.frm' use logfile group lg1 initial_size 1M engine ndb; --error ER_DROP_FILEGROUP_FAILED drop tablespace ts1 @@ -356,8 +363,8 @@ engine ndb; drop logfile group lg1 engine ndb; -drop table t1; - +#drop table t1; +--exec rm $MYSQLTEST_VARDIR/tmp/t1.frm # End 5.1 test |