From c9c5841760ef0c180f2dd04079c3ad2e1d4f3322 Mon Sep 17 00:00:00 2001
From: "jani@hynda.(none)" <>
Date: Tue, 13 May 2003 19:34:51 +0300
Subject: - Fixed a bug in myisam_max_[extra]_sort_file_size, bug ID 339 and
 342 - Fix for QNX: UNIX sockets available since 6.2.1

---
 sql/mysqld.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sql/mysqld.cc')

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index c6a67e2582c..731298266dc 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3839,12 +3839,13 @@ replicating a LOAD DATA INFILE command",
    (gptr*) &global_system_variables.myisam_max_extra_sort_file_size,
    (gptr*) &max_system_variables.myisam_max_extra_sort_file_size,
    0, GET_ULL, REQUIRED_ARG, (ulonglong) MI_MAX_TEMP_LENGTH,
-   0, ~0L, 0, 1, 0},
+   0, (ulonglong) MAX_FILE_SIZE, 0, 1, 0},
   {"myisam_max_sort_file_size", OPT_MYISAM_MAX_SORT_FILE_SIZE,
    "Don't use the fast sort index method to created index if the temporary file would get bigger than this!",
    (gptr*) &global_system_variables.myisam_max_sort_file_size,
    (gptr*) &max_system_variables.myisam_max_sort_file_size, 0,
-   GET_ULL, REQUIRED_ARG, (longlong) LONG_MAX, 0, ~0L, 0, 1024*1024, 0},
+   GET_ULL, REQUIRED_ARG, (longlong) LONG_MAX, 0, (ulonglong) MAX_FILE_SIZE,
+   0, 1024*1024, 0},
   {"myisam_repair_threads", OPT_MYISAM_REPAIR_THREADS,
    "Number of threads to use when repairing MyISAM tables. The value of 1 disables parallel repair.",
    (gptr*) &global_system_variables.myisam_repair_threads,
-- 
cgit v1.2.1