merge mysql-5.0-bugteam to mysql-5.1-bugteam

6f7c7850 · Satya B · fc2243d6 · 5a41fb5c · 6f7c7850
Commit 6f7c7850 authored Sep 03, 2009 by Satya B
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

storage/myisam/myisamchk.c storage/myisam/myisamchk.c +3 -3

No files found.
--- a/storage/myisam/myisamchk.c
+++ b/storage/myisam/myisamchk.c
@@ -302,17 +302,17 @@ static struct my_option my_long_options[] =
    (uchar**) &check_param.read_buffer_length,
    (uchar**) &check_param.read_buffer_length, 0, GET_ULONG, REQUIRED_ARG,
    (long) READ_BUFFER_INIT, (long) MALLOC_OVERHEAD,
-    (long) ~0L, (long) MALLOC_OVERHEAD, (long) 1L, 0},
+    INT_MAX32, (long) MALLOC_OVERHEAD, (long) 1L, 0},
  { "write_buffer_size", OPT_WRITE_BUFFER_SIZE, "",
    (uchar**) &check_param.write_buffer_length,
    (uchar**) &check_param.write_buffer_length, 0, GET_ULONG, REQUIRED_ARG,
    (long) READ_BUFFER_INIT, (long) MALLOC_OVERHEAD,
-    (long) ~0L, (long) MALLOC_OVERHEAD, (long) 1L, 0},
+    INT_MAX32, (long) MALLOC_OVERHEAD, (long) 1L, 0},
  { "sort_buffer_size", OPT_SORT_BUFFER_SIZE, "",
    (uchar**) &check_param.sort_buffer_length,
    (uchar**) &check_param.sort_buffer_length, 0, GET_ULONG, REQUIRED_ARG,
    (long) SORT_BUFFER_INIT, (long) (MIN_SORT_BUFFER + MALLOC_OVERHEAD),
-    (long) ~0L, (long) MALLOC_OVERHEAD, (long) 1L, 0},
+    ULONG_MAX, (long) MALLOC_OVERHEAD, (long) 1L, 0},
  { "sort_key_blocks", OPT_SORT_KEY_BLOCKS, "",
    (uchar**) &check_param.sort_key_blocks,
    (uchar**) &check_param.sort_key_blocks, 0, GET_ULONG, REQUIRED_ARG,