table->keep_row_order no longer need to force DYNAMIC_RECORD

for temporary Aria tables. It can use a faster BLOCK_RECORD
MariaDB · Apr 8, 2015 · 7a387c0 · 7a387c0
1 parent 5d8dbee
commit 7a387c0
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
@@ -16979,20 +16979,15 @@ bool create_internal_tmp_table(TABLE *table, KEY *keyinfo,
   {
     enum data_file_type file_type= table->no_rows ? NO_RECORD :
         (share->reclength < 64 && !share->blob_fields ? STATIC_RECORD :
-         table->used_for_duplicate_elimination || table->keep_row_order ?
-          DYNAMIC_RECORD : BLOCK_RECORD);
-    uint create_flags= HA_CREATE_TMP_TABLE | HA_CREATE_INTERNAL_TABLE;
+         table->used_for_duplicate_elimination ? DYNAMIC_RECORD : BLOCK_RECORD);
+    uint create_flags= HA_CREATE_TMP_TABLE | HA_CREATE_INTERNAL_TABLE |
+        (table->keep_row_order ? HA_PRESERVE_INSERT_ORDER : 0);
 
     if (file_type != NO_RECORD && encrypt_tmp_disk_tables)
     {
       /* encryption is only supported for BLOCK_RECORD */
       file_type= BLOCK_RECORD;
       create_flags|= HA_CREATE_ENCRYPTED;
-      if (table->keep_row_order)
-      {
-        create_flags|= HA_PRESERVE_INSERT_ORDER;
-      }
-
       if (table->used_for_duplicate_elimination)
       {
         /*