ft0000002.test @result removed

ft0000001.test	@result removed
mysql-test-run.sh	fixed
install_test_db.sh	Change mode to -rw-rw-r--
mysql-test-run.sh	Change mode to -rw-rw-r--


mysql-test/install_test_db.sh:
  Change mode to -rw-rw-r--
mysql-test/mysql-test-run.sh:
  fixed
mysql-test/t/ft0000001.test:
  @result removed
mysql-test/t/ft0000002.test:
  @result removed

4 files changed, 17 insertions, 10 deletions

diff --git a/mysql-test/install_test_db.sh b/mysql-test/install_test_db.sh
index 28e6ad34419..28e6ad34419 100755..100644
--- a/mysql-test/install_test_db.sh
+++ b/mysql-test/install_test_db.sh
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 8ff75be324a..abc0452f3b1 100755..100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -3,6 +3,8 @@
 # modified by Sasha Pachev <sasha@mysql.com>
 # Sligtly updated by Monty
 # Cleaned up again by Matt
+# Fixed by Sergei
+# :-)
 
 #++
 # Access Definitions
@@ -11,6 +13,7 @@ DB=test
 DBUSER=test
 DBPASSWD=
 VERBOSE=""
+TZ=GMT-3; export TZ # for UNIX_TIMESTAMP tests to work
 
 # Are we on source or binary distribution?
 
@@ -282,7 +285,7 @@ start_master()
             --datadir=$MASTER_MYDDIR \
 	    --pid-file=$MASTER_MYPID \
 	    --socket=$MASTER_MYSOCK \
-            --log=$MASTER_MYLOG \
+            --log=$MASTER_MYLOG --default-character-set=latin1 \
 	    --language=english $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"
     if [ x$DO_DDD = x1 ]
     then
@@ -323,7 +326,7 @@ start_slave()
 	    --pid-file=$SLAVE_MYPID \
 	    --port=$SLAVE_MYPORT \
 	    --socket=$SLAVE_MYSOCK \
-            --log=$SLAVE_MYLOG \
+            --log=$SLAVE_MYLOG --default-character-set=latin1 \
             --language=english $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT"
     if [ x$DO_DDD = x1 ]
     then
diff --git a/mysql-test/t/ft0000001.test b/mysql-test/t/ft0000001.test
index 339433515b7..05947be51a4 100644
--- a/mysql-test/t/ft0000001.test
+++ b/mysql-test/t/ft0000001.test
@@ -8,12 +8,16 @@ CREATE TABLE test (
 INSERT INTO test (message) VALUES ("Testing"),("table"),("testbug"),
         ("steve"),("is"),("cool"),("steve is cool");
 # basic MATCH
-@r/ft0000001.a.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE MATCH (message) AGAINST ('steve');
+SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE MATCH (message) AGAINST ('steve');
+
 # MATCH + ORDER BY (with ft-ranges)
-@r/ft0000001.b.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE MATCH (message) AGAINST ('steve') ORDER BY a;
+SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE MATCH (message) AGAINST ('steve') ORDER BY a;
+
 # MATCH + ORDER BY (with normal ranges) + UNIQUE
-@r/ft0000001.c.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE a in (2,7,4) and MATCH (message) AGAINST ('steve') ORDER BY a DESC;
+SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE a in (2,7,4) and MATCH (message) AGAINST ('steve') ORDER BY a DESC;
+
 # MATCH + ORDER BY + UNIQUE (const_table)
-@r/ft0000001.d.result SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE a=7 and MATCH (message) AGAINST ('steve') ORDER BY 1;
+SELECT a, MATCH (message) AGAINST ('steve') FROM test WHERE a=7 and MATCH (message) AGAINST ('steve') ORDER BY 1;
+
 # ORDER BY MATCH
-@r/ft0000001.e.result SELECT a, MATCH (message) AGAINST ('steve') as rel FROM test ORDER BY rel;
+SELECT a, MATCH (message) AGAINST ('steve') as rel FROM test ORDER BY rel;
diff --git a/mysql-test/t/ft0000002.test b/mysql-test/t/ft0000002.test
index 994aff5da6b..ca14220a1f8 100644
--- a/mysql-test/t/ft0000002.test
+++ b/mysql-test/t/ft0000002.test
@@ -15,6 +15,6 @@ INSERT INTO test VALUES (1,'lala lolo lili','oooo aaaa pppp');
 INSERT INTO test VALUES (2,'asdf fdsa','lkjh fghj');
 INSERT INTO test VALUES (3,'qpwoei','zmxnvb');
 
-@r/ft0000002.a.result SELECT a, MATCH  b  AGAINST ('lala lkjh') FROM test;
-@r/ft0000002.b.result SELECT a, MATCH  c  AGAINST ('lala lkjh') FROM test;
-@r/ft0000002.c.result SELECT a, MATCH b,c AGAINST ('lala lkjh') FROM test;
+SELECT a, MATCH  b  AGAINST ('lala lkjh') FROM test;
+SELECT a, MATCH  c  AGAINST ('lala lkjh') FROM test;
+SELECT a, MATCH b,c AGAINST ('lala lkjh') FROM test;