diff options
| author | unknown <jmiller/ndbdev@ndb08.mysql.com> | 2007-08-23 15:33:05 +0200 |
|---|---|---|
| committer | unknown <jmiller/ndbdev@ndb08.mysql.com> | 2007-08-23 15:33:05 +0200 |
| commit | a59096c5547d65ca120abfafc84efe9b4c8e5690 (patch) | |
| tree | 852a92ac122ab31c6744d312416cf8b04f6e4fb4 /mysql-test | |
| parent | 650e06af70e21b8eaef4b0455b81a02795a387e4 (diff) | |
| parent | 9534a41c3eb78f6863c578fe20ad79a1e7a3971f (diff) | |
| download | mariadb-git-a59096c5547d65ca120abfafc84efe9b4c8e5690.tar.gz | |
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
into mysql.com:/data1/mysql-5.1-target-5.1.22
Diffstat (limited to 'mysql-test')
| -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 55f1f56fd0c..8cc157183f4 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 |