summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-02-17 02:59:39 +0100
committerunknown <kent@mysql.com>2005-02-17 02:59:39 +0100
commit3f808996794b5ed83f646fd08946a5499bbb665c (patch)
treefb244a988170034eb7d7b6625ac8117dc299b90f /mysql-test/t
parentbc22f79f12e74d8c8e9460f2b237c1310c6350ee (diff)
downloadmariadb-git-3f808996794b5ed83f646fd08946a5499bbb665c.tar.gz
Windows compatibility changes of the 'rpl_delete_all',
'ps_1general' and 'fulltext_cache' test cases. mysql-test/r/fulltext_cache.result: To pass on Windows, round to less digits mysql-test/t/fulltext_cache.test: To pass on Windows, round to less digits mysql-test/t/ps_1general.test: To pass on Windows, change \\ to / in result mysql-test/t/rpl_delete_all.test: To pass on Windows, change \\ to / in result mysql-test/mysql-test-run.pl: Pass mysqld --console to catch output on Windows mysql-test/lib/mtr_process.pl: Check error from exec() to avoid becoming a fork() bomb
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/fulltext_cache.test4
-rw-r--r--mysql-test/t/ps_1general.test1
-rw-r--r--mysql-test/t/rpl_delete_all.test2
3 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/t/fulltext_cache.test b/mysql-test/t/fulltext_cache.test
index 234deab91e6..b01f0d18b76 100644
--- a/mysql-test/t/fulltext_cache.test
+++ b/mysql-test/t/fulltext_cache.test
@@ -29,13 +29,13 @@ INSERT INTO t2 VALUES (6,2,'um chocolate Snickers');
INSERT INTO t2 VALUES (7,1,'Bife');
INSERT INTO t2 VALUES (8,1,'Pizza de Salmao');
-SELECT t1.q, t2.item, t2.id, round(MATCH t2.item AGAINST ('sushi'),8)
+SELECT t1.q, t2.item, t2.id, round(MATCH t2.item AGAINST ('sushi'),6)
as x FROM t1, t2 WHERE (t2.id2 = t1.id) ORDER BY x DESC,t2.id;
SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi' IN BOOLEAN MODE)
as x FROM t1, t2 WHERE (t2.id2 = t1.id) ORDER BY x DESC,t2.id;
-SELECT t1.q, t2.item, t2.id, round(MATCH t2.item AGAINST ('sushi'),8)
+SELECT t1.q, t2.item, t2.id, round(MATCH t2.item AGAINST ('sushi'),6)
as x FROM t2, t1 WHERE (t2.id2 = t1.id) ORDER BY x DESC,t2.id;
SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi' IN BOOLEAN MODE)
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test
index 5450512b959..4ab81dfcac5 100644
--- a/mysql-test/t/ps_1general.test
+++ b/mysql-test/t/ps_1general.test
@@ -599,6 +599,7 @@ drop table t2;
prepare stmt1 from ' rename table t5 to t6, t7 to t8 ' ;
create table t5 (a int) ;
# rename must fail, t7 does not exist
+--replace_result \\ /
--error 1017
execute stmt1 ;
create table t7 (a int) ;
diff --git a/mysql-test/t/rpl_delete_all.test b/mysql-test/t/rpl_delete_all.test
index 23848720107..ad2ce29c610 100644
--- a/mysql-test/t/rpl_delete_all.test
+++ b/mysql-test/t/rpl_delete_all.test
@@ -6,7 +6,7 @@ connection master;
drop database if exists mysqltest;
sync_slave_with_master;
# can't read dir
---replace_result "Errcode: 1" "Errcode: X" "Errcode: 2" "Errcode: X"
+--replace_result "Errcode: 1" "Errcode: X" "Errcode: 2" "Errcode: X" \\ /
--error 12
show tables from mysqltest;