database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

ft0000002.test @result removed

Browse Source 
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--
This commit is contained in:
serg@serg.mysql.com
2000-12-30 16:24:31 +01:00
parent 59d860e920
commit 0cfa5a6962
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
mysql-test/install_test_db.sh Executable file → Normal file
View File

7
mysql-test/mysql-test-run.sh Executable file → Normal file
View File

@@ -3,6 +3,8 @@
# modified by Sasha Pachev <sasha@mysql.com> # modified by Sasha Pachev <sasha@mysql.com>
# Sligtly updated by Monty # Sligtly updated by Monty
# Cleaned up again by Matt # Cleaned up again by Matt
# Fixed by Sergei
# :-)
#++ #++
# Access Definitions # Access Definitions
@@ -11,6 +13,7 @@ DB=test
DBUSER=test DBUSER=test
DBPASSWD= DBPASSWD=
VERBOSE="" VERBOSE=""
TZ=GMT-3; export TZ # for UNIX_TIMESTAMP tests to work
# Are we on source or binary distribution? # Are we on source or binary distribution?
@@ -282,7 +285,7 @@ start_master()
--datadir=$MASTER_MYDDIR \ --datadir=$MASTER_MYDDIR \
--pid-file=$MASTER_MYPID \ --pid-file=$MASTER_MYPID \
--socket=$MASTER_MYSOCK \ --socket=$MASTER_MYSOCK \
--log=$MASTER_MYLOG \ --log=$MASTER_MYLOG --default-character-set=latin1 \
--language=english $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT" --language=english $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"
if [ x$DO_DDD = x1 ] if [ x$DO_DDD = x1 ]
then then
@@ -323,7 +326,7 @@ start_slave()
--pid-file=$SLAVE_MYPID \ --pid-file=$SLAVE_MYPID \
--port=$SLAVE_MYPORT \ --port=$SLAVE_MYPORT \
--socket=$SLAVE_MYSOCK \ --socket=$SLAVE_MYSOCK \
--log=$SLAVE_MYLOG \ --log=$SLAVE_MYLOG --default-character-set=latin1 \
--language=english $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT" --language=english $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT"
if [ x$DO_DDD = x1 ] if [ x$DO_DDD = x1 ]
then then

14
mysql-test/t/ft0000001.test
View File

@@ -8,12 +8,16 @@ CREATE TABLE test (
INSERT INTO test (message) VALUES ("Testing"),("table"),("testbug"), INSERT INTO test (message) VALUES ("Testing"),("table"),("testbug"),
("steve"),("is"),("cool"),("steve is cool"); ("steve"),("is"),("cool"),("steve is cool");
# basic MATCH # 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) # 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 # 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) # 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 # 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;

6
mysql-test/t/ft0000002.test
View File

@@ -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 (2,'asdf fdsa','lkjh fghj');
INSERT INTO test VALUES (3,'qpwoei','zmxnvb'); INSERT INTO test VALUES (3,'qpwoei','zmxnvb');
@r/ft0000002.a.result SELECT a, MATCH b AGAINST ('lala lkjh') FROM test; SELECT a, MATCH b AGAINST ('lala lkjh') FROM test;
@r/ft0000002.b.result SELECT a, MATCH c AGAINST ('lala lkjh') FROM test; 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,c AGAINST ('lala lkjh') FROM test;