← Back to branch summary

~sergei.glushchenko/percona-server/5.1.55-issue20632

« back to all changes in this revision

Viewing changes to control_online_alter_index.patch

  • Committer: kinoyasu
  • Date: 2011-02-09 11:29:44 UTC
  • Revision ID: kinoyasu@gauntlet4-20110209112944-eeuv6cafcbit1jls
port Yasufumi patches to 5.1.55

Show diffs side-by-side

added added

removed removed

Lines of Context:
control_online_alter_index.patch
31
31
diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
32
32
--- a/sql/mysqld.cc     2010-07-21 22:49:54.011529414 +0900
33
33
+++ b/sql/mysqld.cc     2010-07-21 22:50:24.112527179 +0900
34
 
@@ -5872,6 +5872,7 @@
 
34
@@ -5874,6 +5874,7 @@
35
35
   OPT_USERSTAT_RUNNING,
36
36
   OPT_THREAD_STATISTICS,
37
37
   OPT_OPTIMIZER_FIX,
39
39
   OPT_SUPPRESS_LOG_WARNING_1592,
40
40
   OPT_QUERY_CACHE_STRIP_COMMENTS,
41
41
   OPT_USE_GLOBAL_LONG_QUERY_TIME,
42
 
@@ -5903,6 +5904,13 @@
 
42
@@ -5905,6 +5906,13 @@
43
43
    "from libc.so",
44
44
    &opt_allow_suspicious_udfs, &opt_allow_suspicious_udfs,
45
45
    0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
83
83
diff -ruN a/sql/sql_partition.cc b/sql/sql_partition.cc
84
84
--- a/sql/sql_partition.cc      2010-06-04 00:50:11.000000000 +0900
85
85
+++ b/sql/sql_partition.cc      2010-07-21 22:50:24.140530183 +0900
86
 
@@ -4358,7 +4358,12 @@
 
86
@@ -4359,7 +4359,12 @@
87
87
         alter_info->no_parts= curr_part_no - new_part_no;
88
88
       }
89
89
     }