Commit 6c83ba5c authored by unknown's avatar unknown
Browse files

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  april.(none):/home/svoj/devel/mysql/BUG14194/mysql-5.1-new


mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
parents ca4935e6 0d0d68ab

include/config-netware.h

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ extern "C" { 
/* On NetWare, stack grows towards lower address*/

#define STACK_DIRECTION -1



/* On NetWare, we need to set stack size for threads, otherwise default 16K is used */

#define NW_THD_STACKSIZE 65536



/* On NetWare, to fix the problem with the deletion of open files */

#define CANT_DELETE_OPEN_FILES 1

mysql-test/include/have_euckr.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
-- require r/have_euckr.require

disable_query_log;

show collation like "euckr_korean_ci";

enable_query_log;

mysql-test/include/have_gb2312.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
-- require r/have_gb2312.require

disable_query_log;

show collation like "gb2312_chinese_ci";

enable_query_log;

mysql-test/mysql-test-run.pl

+2 −1
Original line number Diff line number Diff line
@@ -947,7 +947,8 @@ sub executable_setup () { 
    {

      $path_client_bindir= mtr_path_exists("$glob_basedir/client_release",

                                           "$glob_basedir/bin");

      $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-nt",

      $exe_mysqld=         mtr_exe_exists ("$path_client_bindir/mysqld-max",

                                           "$path_client_bindir/mysqld-nt",

                                           "$path_client_bindir/mysqld",

                                           "$path_client_bindir/mysqld-debug",);

      $path_language=      mtr_path_exists("$glob_basedir/share/english/");

mysql-test/ndb/ndb_config_1_node.ini

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ MaxNoOfOrderedIndexes= CHOOSE_MaxNoOfOrderedIndexes 
MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes

TimeBetweenGlobalCheckpoints= 500

NoOfFragmentLogFiles= 3

DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory



[ndbd]

HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress