summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-07-01 17:26:45 +0300
committerunknown <monty@mysql.com>2004-07-01 17:26:45 +0300
commit0fc82282cb72a10d1bc293eb2f19428e52f72269 (patch)
tree942cc0adee19c152a23401506e9193bdef977c3f
parent904ab369e1c407169680a5914dc9961f76febf75 (diff)
downloadmariadb-git-0fc82282cb72a10d1bc293eb2f19428e52f72269.tar.gz
Portability fixes (For Netware)
mysql-test/r/rpl_delete_all.result: Portability fix mysql-test/t/rpl_delete_all.test: Portability fix netware/BUILD/compile-netware-standard: Patch from novell
-rw-r--r--mysql-test/r/rpl_delete_all.result2
-rw-r--r--mysql-test/t/rpl_delete_all.test5
-rwxr-xr-xnetware/BUILD/compile-netware-standard1
3 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_delete_all.result b/mysql-test/r/rpl_delete_all.result
index 9966d73f3dd..97a535490dd 100644
--- a/mysql-test/r/rpl_delete_all.result
+++ b/mysql-test/r/rpl_delete_all.result
@@ -9,7 +9,7 @@ drop database if exists test1;
Warnings:
Note 1008 Can't drop database 'test1'; database doesn't exist
show tables from test1;
-ERROR HY000: Can't read dir of './test1/' (Errcode: 2)
+ERROR HY000: Can't read dir of './test1/' (Errcode: X)
create table t1 (a int);
drop table if exists t1;
Warnings:
diff --git a/mysql-test/t/rpl_delete_all.test b/mysql-test/t/rpl_delete_all.test
index cb6da3674da..6ca98b34caf 100644
--- a/mysql-test/t/rpl_delete_all.test
+++ b/mysql-test/t/rpl_delete_all.test
@@ -6,7 +6,8 @@ connection master;
drop database if exists test1;
sync_slave_with_master;
# can't read dir
-error 12;
+--replace_result "Errcode: 1" "Errcode: X" "Errcode: 2" "Errcode: X"
+--error 12
show tables from test1;
connection slave;
@@ -15,7 +16,7 @@ connection master;
drop table if exists t1;
sync_slave_with_master;
# table does not exist
-error 1146;
+--error 1146
select * from t1;
connection master;
diff --git a/netware/BUILD/compile-netware-standard b/netware/BUILD/compile-netware-standard
index a21ea16a445..76a776a1da3 100755
--- a/netware/BUILD/compile-netware-standard
+++ b/netware/BUILD/compile-netware-standard
@@ -15,6 +15,7 @@ suffix="standard"
extra_configs=" \
--with-innodb \
--enable-thread-safe-client \
+ --with-archive-storage-engine \
"
. $path/compile-netware-END