merge 5.5 => 5.6

Tor Didriksen · Tor Didriksen · commit c18d4ac96522 · 2013-10-29T19:41:28.000+01:00
diff --git a/sql/filesort.cc b/sql/filesort.cc
@@ -286,8 +286,18 @@ ha_rows filesort(THD *thd, TABLE *table, Filesort *filesort,
   {
     DBUG_PRINT("info", ("filesort PQ is not applicable"));
 
+    /*
+      We need space for at least one record from each merge chunk, i.e.
+        param->max_keys_per_buffer >= MERGEBUFF2
+      See merge_buffers()),
+      memory_available must be large enough for
+        param->max_keys_per_buffer * (record + record pointer) bytes
+      (the main sort buffer, see alloc_sort_buffer()).
+      Hence this minimum:
+    */
     const ulong min_sort_memory=
-      max(MIN_SORT_MEMORY, param.sort_length * MERGEBUFF2);
+      max<ulong>(MIN_SORT_MEMORY,
+                 ALIGN_SIZE(MERGEBUFF2 * (param.rec_length + sizeof(uchar*))));
     while (memory_available >= min_sort_memory)
     {
       ha_rows keys= memory_available / (param.rec_length + sizeof(char*));
diff --git a/sql/sql_const.h b/sql/sql_const.h
@@ -78,8 +78,8 @@
 
 #define MAX_SELECT_NESTING (sizeof(nesting_map)*8-1)
 
-#define DEFAULT_SORT_MEMORY (256U* 1024U)
-#define MIN_SORT_MEMORY     (32U * 1024U)
+#define DEFAULT_SORT_MEMORY (256UL* 1024UL)
+#define MIN_SORT_MEMORY     (32UL * 1024UL)
 
 /* Some portable defines */
 
