Added ORDER BY to test case to make the result comparable

Docs/manual.texi:
  Added replication information
mysql-test/mysql-test-run.sh:
  Don't start master when we are running a test against the running server
mysql-test/r/fulltext_cache.result:
  Added sort to make the result comparable
mysql-test/t/fulltext_cache.test:
  Added sort to make the result comparable

3 files changed, 47 insertions, 44 deletions

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 3cdfa836014..0bc6d5598c8 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -93,6 +93,7 @@ SLAVE_RUNNING=0
 SLAVE_MYPORT=9307
 NO_SLAVE=0
 
+EXTRA_MASTER_OPT=""
 EXTRA_MYSQL_TEST_OPT=""
 USE_RUNNING_SERVER=1
 DO_GCOV=""
@@ -505,49 +506,51 @@ run_testcase ()
    return
  fi
 
- if [ -f $master_opt_file ] ;
+ if [ -z "$USE_RUNNING_SERVER" ] ;
  then
-  EXTRA_MASTER_OPT=`$CAT $master_opt_file`
-  stop_master
-  start_master
- else
-  if [ ! -z "$EXTRA_MASTER_OPT" ] || [ x$MASTER_RUNNING != x1 ] ;
-  then
-    EXTRA_MASTER_OPT=""
-    stop_master
-    start_master
-  fi  
- fi
- do_slave_restart=0
+   if [ -f $master_opt_file ] ;
+   then
+     EXTRA_MASTER_OPT=`$CAT $master_opt_file`
+     stop_master
+     start_master
+   else
+     if [ ! -z "$EXTRA_MASTER_OPT" ] || [ x$MASTER_RUNNING != x1 ] ;
+     then
+       EXTRA_MASTER_OPT=""
+       stop_master
+       start_master
+     fi  
+   fi
+   do_slave_restart=0
  
- if [ -f $slave_opt_file ] ;
- then
-  EXTRA_SLAVE_OPT=`$CAT $slave_opt_file`
-  do_slave_restart=1
- else
-  if [ ! -z "$EXTRA_SLAVE_OPT" ] || [ x$SLAVE_RUNNING != x1 ] ;
-  then
-    EXTRA_SLAVE_OPT=""
-    do_slave_restart=1    
-  fi  
- fi
-
- if [ -f $slave_master_info_file ] ; then
-   SLAVE_MASTER_INFO=`$CAT $slave_master_info_file`
-   do_slave_restart=1
- else
-  if [ ! -z "$SLAVE_MASTER_INFO" ] || [ x$SLAVE_RUNNING != x1 ] ;
-  then
-    SLAVE_MASTER_INFO=""
-    do_slave_restart=1    
-  fi  
- fi
+   if [ -f $slave_opt_file ] ;
+   then
+     EXTRA_SLAVE_OPT=`$CAT $slave_opt_file`
+     do_slave_restart=1
+   else
+    if [ ! -z "$EXTRA_SLAVE_OPT" ] || [ x$SLAVE_RUNNING != x1 ] ;
+    then
+      EXTRA_SLAVE_OPT=""
+      do_slave_restart=1    
+    fi  
+   fi
 
- if [ x$do_slave_restart = x1 ] ; then
-  stop_slave
-  start_slave
+   if [ -f $slave_master_info_file ] ; then
+     SLAVE_MASTER_INFO=`$CAT $slave_master_info_file`
+     do_slave_restart=1
+   else
+     if [ ! -z "$SLAVE_MASTER_INFO" ] || [ x$SLAVE_RUNNING != x1 ] ;
+     then
+       SLAVE_MASTER_INFO=""
+       do_slave_restart=1    
+     fi  
+   fi
+
+   if [ x$do_slave_restart = x1 ] ; then
+     stop_slave
+     start_slave
+   fi
  fi
-
  cd $MYSQL_TEST_DIR
   
  if [ -f $tf ] ; then
diff --git a/mysql-test/r/fulltext_cache.result b/mysql-test/r/fulltext_cache.result
index 347e53f37e1..b2423816a86 100644
--- a/mysql-test/r/fulltext_cache.result
+++ b/mysql-test/r/fulltext_cache.result
@@ -12,7 +12,7 @@ aaaaaaaaa dsaass de	sushi	1	0
 aaaaaaaaa dsaass de	Bolo de Chocolate	2	0
 aaaaaaaaa dsaass de	Feijoada	3	0
 aaaaaaaaa dsaass de	Mousse de Chocolate	4	0
-aaaaaaaaa dsaass de	Bife	7	0
-aaaaaaaaa dsaass de	Pizza de Salmao	8	0
 ssde df s fsda sad er	um copo de Vodka	5	0
 ssde df s fsda sad er	um chocolate Snickers	6	0
+aaaaaaaaa dsaass de	Bife	7	0
+aaaaaaaaa dsaass de	Pizza de Salmao	8	0
diff --git a/mysql-test/t/fulltext_cache.test b/mysql-test/t/fulltext_cache.test
index c6c76ee9182..fc5f0e266b3 100644
--- a/mysql-test/t/fulltext_cache.test
+++ b/mysql-test/t/fulltext_cache.test
@@ -2,6 +2,7 @@
 # Bugreport due to Roy Nasser <roy@vem.ca>
 #
 
+drop table if exists t1, t2;
 CREATE TABLE t1 (
   id int(10) unsigned NOT NULL auto_increment,
   q varchar(255) default NULL,
@@ -26,10 +27,9 @@ INSERT INTO t2 VALUES (7,1,'Bife');
 INSERT INTO t2 VALUES (8,1,'Pizza de Salmao');
 
 SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi') as x FROM t1, t2
-WHERE (t2.id2 = t1.id) ORDER BY x DESC;
+WHERE (t2.id2 = t1.id) ORDER BY x DESC,t2.id;
 
 SELECT t1.q, t2.item, t2.id, MATCH t2.item AGAINST ('sushi') as x FROM t2, t1
-WHERE (t2.id2 = t1.id) ORDER BY x DESC;
+WHERE (t2.id2 = t1.id) ORDER BY x DESC,t2.id;
 
 drop table t1, t2;
-