~tsarev/percona-server/5.5-processlist_rows_stats-sporadic_fails-fix

« back to all changes in this revision

Viewing changes to control_online_alter_index.patch

  • Committer: kinoyasu
  • Date: 2011-05-10 11:57:42 UTC
  • Revision ID: kinoyasu@gauntlet4-20110510115742-3i3194rn2m8fipm2
port Yasufumi patches to 5.5.12

Show diffs side-by-side

added added

removed removed

Lines of Context:
49
49
diff -ruN a/sql/sql_table.cc b/sql/sql_table.cc
50
50
--- a/sql/sql_table.cc  2010-11-03 07:01:14.000000000 +0900
51
51
+++ b/sql/sql_table.cc  2010-12-03 13:51:04.768955495 +0900
52
 
@@ -6117,6 +6117,10 @@
 
52
@@ -6112,6 +6112,10 @@
53
53
     uint  *idx_end_p;
54
54
 
55
55
     alter_flags= table->file->alter_table_flags(alter_info->flags);
63
63
diff -ruN a/sql/sys_vars.cc b/sql/sys_vars.cc
64
64
--- a/sql/sys_vars.cc   2010-12-02 21:23:05.569356468 +0900
65
65
+++ b/sql/sys_vars.cc   2010-12-03 14:05:28.857356603 +0900
66
 
@@ -2150,6 +2150,13 @@
 
66
@@ -2186,6 +2186,13 @@
67
67
        GLOBAL_VAR(opt_optimizer_fix),
68
68
        NO_CMD_LINE, DEFAULT(TRUE));
69
69