← Back to branch summary

~percona-dev/percona-server/release-5.5.11-20.2-fix-bug-764138

« back to all changes in this revision

Viewing changes to slow_extended.patch

  • Committer: Ignacio Nin
  • Date: 2011-03-27 18:30:06 UTC
  • mfrom: (88.2.3 5.5.10)
  • Revision ID: ignacio.nin@percona.com-20110327183006-ij0o2pdyhzaerish
Merge 5.5.10 changes

Merge 5.5.10 changes to release-5.5.9-20.1 in order to create release-5.5.10-20.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
slow_extended.patch
165
165
     if (table_sort.buffpek && table_sort.buffpek_len < maxbuffer)
166
166
     {
167
167
       my_free(table_sort.buffpek);
168
 
@@ -1197,6 +1199,7 @@
 
168
@@ -1216,6 +1218,7 @@
169
169
   DBUG_ENTER("merge_buffers");
170
170
 
171
171
   status_var_increment(current_thd->status_var.filesort_merge_passes);
315
315
 
316
316
         /* Note that my_b_write() assumes it knows the length for this */
317
317
         if (my_b_write(&log_file, (uchar*) buff, buff_len))
318
 
@@ -2711,12 +2752,69 @@
 
318
@@ -2711,12 +2751,69 @@
319
319
     sprintf(query_time_buff, "%.6f", ulonglong2double(query_utime)/1000000.0);
320
320
     sprintf(lock_time_buff,  "%.6f", ulonglong2double(lock_utime)/1000000.0);
321
321
     if (my_b_printf(&log_file,
430
430
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
431
431
--- a/sql/mysqld.cc     2011-02-21 22:57:24.442081625 +0200
432
432
+++ b/sql/mysqld.cc     2011-02-21 22:59:30.845699981 +0200
433
 
@@ -418,6 +418,10 @@
 
433
@@ -419,6 +419,10 @@
434
434
 char* opt_secure_file_priv;
435
435
 my_bool opt_log_slow_admin_statements= 0;
436
436
 my_bool opt_log_slow_slave_statements= 0;
441
441
 my_bool lower_case_file_system= 0;
442
442
 my_bool opt_large_pages= 0;
443
443
 my_bool opt_super_large_pages= 0;
444
 
@@ -5784,10 +5788,10 @@
 
444
@@ -5806,10 +5810,10 @@
445
445
    "Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements to "
446
446
    "the slow log if it is open.", &opt_log_slow_admin_statements,
447
447
    &opt_log_slow_admin_statements, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
454
454
   {"log-slow-queries", OPT_SLOW_QUERY_LOG,
455
455
    "Log slow queries to a table or log file. Defaults logging to table "
456
456
    "mysql.slow_log or hostname-slow.log if --log-output=file is used. "
457
 
@@ -7179,6 +7183,10 @@
 
457
@@ -7194,6 +7198,10 @@
458
458
 
459
459
 C_MODE_END
460
460
 
465
465
 /**
466
466
   Get server options from the command line,
467
467
   and perform related server initializations.
468
 
@@ -7318,6 +7326,8 @@
 
468
@@ -7335,6 +7343,8 @@
469
469
   global_system_variables.long_query_time= (ulonglong)
470
470
     (global_system_variables.long_query_time_double * 1e6);
471
471
 
533
533
diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc
534
534
--- a/sql/sql_class.cc  2011-01-20 00:37:09.000000000 +0200
535
535
+++ b/sql/sql_class.cc  2011-02-21 22:57:48.843760997 +0200
536
 
@@ -367,6 +367,37 @@
 
536
@@ -368,6 +368,37 @@
537
537
   thd->warning_info->inc_current_row_for_warning();
538
538
 }
539
539
 
571
571
 
572
572
 /**
573
573
   Dumps a text description of a thread, its security context
574
 
@@ -661,6 +692,7 @@
 
574
@@ -662,6 +693,7 @@
575
575
     *cond_hdl= NULL;
576
576
     return FALSE;
577
577
   }
579
579
 
580
580
   for (Internal_error_handler *error_handler= m_internal_handler;
581
581
        error_handler;
582
 
@@ -3389,6 +3421,12 @@
 
582
@@ -3390,6 +3422,12 @@
583
583
     first_successful_insert_id_in_prev_stmt;
584
584
   backup->first_successful_insert_id_in_cur_stmt= 
585
585
     first_successful_insert_id_in_cur_stmt;
592
592
 
593
593
   if ((!lex->requires_prelocking() || is_update_query(lex->sql_command)) &&
594
594
       !is_current_stmt_binlog_format_row())
595
 
@@ -3409,6 +3447,14 @@
 
595
@@ -3410,6 +3448,14 @@
596
596
   cuted_fields= 0;
597
597
   transaction.savepoints= 0;
598
598
   first_successful_insert_id_in_cur_stmt= 0;
607
607
 }
608
608
 
609
609
 
610
 
@@ -3471,6 +3517,12 @@
 
610
@@ -3472,6 +3518,12 @@
611
611
   */
612
612
   examined_row_count+= backup->examined_row_count;
613
613
   cuted_fields+=       backup->cuted_fields;
825
825
diff -ruN a/sql/sql_select.cc b/sql/sql_select.cc
826
826
--- a/sql/sql_select.cc 2011-02-21 22:57:24.411087114 +0200
827
827
+++ b/sql/sql_select.cc 2011-02-21 22:57:48.867756749 +0200
828
 
@@ -6872,7 +6872,10 @@
 
828
@@ -6894,7 +6894,10 @@
829
829
          {
830
830
            join->thd->server_status|=SERVER_QUERY_NO_INDEX_USED;
831
831
            if (statistics)
836
836
          }
837
837
        }
838
838
        else
839
 
@@ -6886,7 +6889,10 @@
 
839
@@ -6908,7 +6911,10 @@
840
840
          {
841
841
            join->thd->server_status|=SERVER_QUERY_NO_INDEX_USED;
842
842
            if (statistics)
847
847
          }
848
848
        }
849
849
        if (!table->no_keyread)
850
 
@@ -10217,6 +10223,7 @@
 
850
@@ -10239,6 +10245,7 @@
851
851
               (ulong) rows_limit,test(group)));
852
852
 
853
853
   status_var_increment(thd->status_var.created_tmp_tables);
855
855
 
856
856
   if (use_temp_pool && !(test_flags & TEST_KEEP_TMP_TABLES))
857
857
     temp_pool_slot = bitmap_lock_set_next(&temp_pool);
858
 
@@ -11115,6 +11122,7 @@
 
858
@@ -11137,6 +11144,7 @@
859
859
     goto err;
860
860
   }
861
861
   status_var_increment(table->in_use->status_var.created_tmp_disk_tables);
863
863
   share->db_record_offset= 1;
864
864
   DBUG_RETURN(0);
865
865
  err:
866
 
@@ -11133,6 +11141,14 @@
 
866
@@ -11155,6 +11163,14 @@
867
867
   save_proc_info=thd->proc_info;
868
868
   thd_proc_info(thd, "removing tmp table");
869
869
 
881
881
diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
882
882
--- a/sql/sql_show.cc   2011-02-21 22:57:24.456079146 +0200
883
883
+++ b/sql/sql_show.cc   2011-02-21 22:57:48.873755686 +0200
884
 
@@ -1942,8 +1942,17 @@
 
884
@@ -1943,8 +1943,17 @@
885
885
         table->field[4]->store(command_name[tmp->command].str,
886
886
                                command_name[tmp->command].length, cs);
887
887
       /* MYSQL_TIME */