List:Commits« Previous MessageNext Message »
From:Alexey Kopytov Date:September 3 2007 8:58am
Subject:bk commit into 5.1 tree (kaa:1.2582) BUG#5731
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-09-03 12:57:47+04:00, kaa@polly.(none) +2 -0
  Use SIZE_T_MAX instead of ulong as a limit for key_buffer_size to allow key_bufer_size > 4G on Windows in 5.1. This is for bug #5731.

  include/my_global.h@stripped, 2007-09-03 12:57:40+04:00, kaa@polly.(none) +3 -0
    Added SIZE_T_MAX.

  sql/mysqld.cc@stripped, 2007-09-03 12:57:40+04:00, kaa@polly.(none) +1 -1
    Use SIZE_T_MAX instead of ulong as a limit for key_buffer_size to allow key_bufer_size > 4G on Windows in 5.1.

diff -Nrup a/include/my_global.h b/include/my_global.h
--- a/include/my_global.h	2007-07-24 01:19:22 +04:00
+++ b/include/my_global.h	2007-09-03 12:57:40 +04:00
@@ -863,6 +863,9 @@ typedef SOCKET_SIZE_TYPE size_socket;
 #ifndef SSIZE_MAX
 #define SSIZE_MAX ((~((size_t) 0)) / 2)
 #endif
+#ifndef SIZE_T_MAX
+#define SIZE_T_MAX ~((size_t) 0)
+#endif
 
 #ifndef HAVE_FINITE
 #define finite(x) (1.0 / fabs(x) > 0.0)
diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2007-08-28 11:02:53 +04:00
+++ b/sql/mysqld.cc	2007-09-03 12:57:40 +04:00
@@ -5969,7 +5969,7 @@ log and this option does nothing anymore
    (uchar**) &dflt_key_cache_var.param_buff_size,
    (uchar**) 0,
    0, (GET_ULL | GET_ASK_ADDR),
-   REQUIRED_ARG, KEY_CACHE_SIZE, MALLOC_OVERHEAD, ~(ulong) 0, MALLOC_OVERHEAD,
+   REQUIRED_ARG, KEY_CACHE_SIZE, MALLOC_OVERHEAD, SIZE_T_MAX, MALLOC_OVERHEAD,
    IO_SIZE, 0},
   {"key_cache_age_threshold", OPT_KEY_CACHE_AGE_THRESHOLD,
    "This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in key cache",
Thread
bk commit into 5.1 tree (kaa:1.2582) BUG#5731Alexey Kopytov3 Sep