summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <greg@mysql.com>2003-03-21 16:45:39 -0500
committerunknown <greg@mysql.com>2003-03-21 16:45:39 -0500
commit2ec4163759bc19f5fc03cd5a0b1072afcdb16947 (patch)
tree6204247b50ae737bead82de5fdfbc3bdd63689b1 /mysql-test
parent0f18ab78970cd64418646e83a32d7e487477fb86 (diff)
downloadmariadb-git-2ec4163759bc19f5fc03cd5a0b1072afcdb16947.tar.gz
Post-4.0.12 changes from Novell: mostly NetWare-related code changes to utilize new LibC
client/mysql.cc: Remove unnecessary pthread_yield calls for NetWare client/mysqldump.c: Remove unnecessary pthread_yield calls for NetWare include/my_pthread.h: Special extern my_pthread_cond_timedwait no longer required for NetWare mysql-test/t/backup.test: replace_result added so test passes correctly on NetWare mysys/default.c: Add conditional to avoid non-applicable file checking on NetWare mysys/my_init.c: Remove working directory change from netware_init() mysys/my_pthread.c: Remove unnecessary NetWare version of my_pthread_cond_timedwait mysys/thr_mutex.c: Remove unnecessary NetWare block scripts/make_binary_distribution.sh: Changes to clear up extraneous EXTRA_BIN_FILES, NetWare sections
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/backup.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/backup.test b/mysql-test/t/backup.test
index 0346e6ba456..650b85477f5 100644
--- a/mysql-test/t/backup.test
+++ b/mysql-test/t/backup.test
@@ -7,10 +7,10 @@ connect (con2,localhost,root,,);
connection con1;
set SQL_LOG_BIN=0;
create table t4(n int);
---replace_result "errno: 2" "errno: X" "errno: 22" "errno: X" "errno: 23" "errno: X"
+--replace_result "errno: 1" "errno: X" "errno: 2" "errno: X" "errno: 22" "errno: X" "errno: 23" "errno: X"
backup table t4 to '../bogus';
backup table t4 to '../tmp';
---replace_result "errno: 17" "errno: X"
+--replace_result "errno: 7" "errno: X" "errno: 17" "errno: X"
backup table t4 to '../tmp';
drop table t4;
restore table t4 from '../tmp';