MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:June 12 2010 4:12pm
Subject:bzr commit into mysql-5.1-bugteam branch (davi:3431) Bug#54457
View as plain text  
# At a local mysql-5.1-bugteam repository of davi

 3431 Davi Arnaut	2010-06-12
      Bug#54457: Test suite broken for 32-bit build
      
      The default value of the myisam_max_extra_sort_file_size could be
      higher than the maximum accepted value, leading to warnings upon
      the server start.
      
      The solution is to simply set the value to the maximum value in a
      32-bit built (2147483647, one less than the current). This should
      be harmless as the option is currently unused in 5.1.
     @ include/myisam.h
        Remove now-unused macro.
     @ sql/mysqld.cc
        Set max value to INT_MAX32.

    modified:
      include/myisam.h
      sql/mysqld.cc
=== modified file 'include/myisam.h'
--- a/include/myisam.h	2009-12-17 11:45:13 +0000
+++ b/include/myisam.h	2010-06-12 16:12:24 +0000
@@ -55,8 +55,6 @@ extern "C" {
 #define MI_MAX_MSG_BUF      1024 /* used in CHECK TABLE, REPAIR TABLE */
 #define MI_NAME_IEXT	".MYI"
 #define MI_NAME_DEXT	".MYD"
-/* Max extra space to use when sorting keys */
-#define MI_MAX_TEMP_LENGTH	2*1024L*1024L*1024L
 
 /* Possible values for myisam_block_size (must be power of 2) */
 #define MI_KEY_BLOCK_LENGTH	1024	/* default key block length */

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-06-11 12:52:06 +0000
+++ b/sql/mysqld.cc	2010-06-12 16:12:24 +0000
@@ -6928,7 +6928,7 @@ thread is in the relay logs.",
    "It will be removed in MySQL " VER_CELOSIA,
    &global_system_variables.myisam_max_extra_sort_file_size,
    &max_system_variables.myisam_max_extra_sort_file_size,
-   0, GET_ULL, REQUIRED_ARG, (ulonglong) MI_MAX_TEMP_LENGTH,
+   0, GET_ULL, REQUIRED_ARG, (ulonglong) INT_MAX32,
    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 "


Attachment: [text/bzr-bundle] bzr/davi.arnaut@sun.com-20100612161224-w23n4lxb1m8rkv8v.bundle
Thread
bzr commit into mysql-5.1-bugteam branch (davi:3431) Bug#54457Davi Arnaut12 Jun
Re: bzr commit into mysql-5.1-bugteam branch (davi:3431) Bug#54457Konstantin Osipov25 Jun