Commit 0cfa5a69 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

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--
parent 59d860e9

mysql-test/install_test_db.sh

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

mysql-test/mysql-test-run.sh

100755 → 100644
+5 −2
Original line number Diff line number Diff line
@@ -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

mysql-test/t/ft0000001.test

+9 −5
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/ft0000002.test

+3 −3
Original line number Diff line number Diff line
@@ -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;