bzr push into mysql-5.1-bugteam branch (aelkin:2747 to 2748) Bug#31240

[Andrei Elkin]

 2748 Andrei Elkin	2009-01-26
      Bug #31240  	load data infile replication between (4.0 or 4.1) and 5.1 fails
      
      Overriding a default value of --secure-file-priv on pb.mtr with a value allowable 
      the test to pass on pb.
modified:
  mysql-test/suite/rpl/t/rpl_cross_version-master.opt

 2747 Ramil Kalimullin	2009-01-26
      Fix for bug #37756: enabling fulltext indexes with
        myisam_repair_threads > 1 causes crash
      
      Problem: parallel repair (myisam_repair_threads > 1) of a myisam
      table with two or more fulltext keys that use the same parser may
      lead to a server crash. ALTER TABLE ENABLE KEYS is affected as well.
      
      Fix: properly initialize fulltext structures for parallel repair.
      
      Note: 1. there's no deterministic test case.
      2. now we call parser->init() for each fulltext key
      (not for each fulltext parser used).
modified:
  include/myisam.h
  storage/myisam/ft_parser.c
  storage/myisam/ftdefs.h
  storage/myisam/mi_check.c
  storage/myisam/mi_open.c
  storage/myisam/myisamdef.h

=== modified file 'mysql-test/suite/rpl/t/rpl_cross_version-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_cross_version-master.opt	2009-01-22 14:55:14 +0000
+++ b/mysql-test/suite/rpl/t/rpl_cross_version-master.opt	2009-01-26 14:49:42 +0000
@@ -1 +1 @@
---replicate-same-server-id --relay-log=slave-relay-bin
+--replicate-same-server-id --relay-log=slave-relay-bin --secure-file-priv=$MYSQL_TEST_DIR