~gl-az/percona-server/5.5.18_19_merge

« back to all changes in this revision

Viewing changes to patches/innodb_expand_fast_index_creation.patch

  • Committer: Stewart Smith
  • Date: 2011-11-17 00:21:45 UTC
  • mfrom: (190.2.9 merge)
  • Revision ID: stewart@flamingspork.com-20111117002145-6180fuj12147yk9i
merge 5.5.17 port

Show diffs side-by-side

added added

removed removed

Lines of Context:
864
864
+--source include/wait_until_count_sessions.inc
865
865
--- a/sql/sql_lex.cc
866
866
+++ b/sql/sql_lex.cc
867
 
@@ -1631,6 +1631,9 @@
 
867
@@ -1632,6 +1632,9 @@
868
868
   alter_list(rhs.alter_list, mem_root),
869
869
   key_list(rhs.key_list, mem_root),
870
870
   create_list(rhs.create_list, mem_root),
874
874
   flags(rhs.flags),
875
875
   keys_onoff(rhs.keys_onoff),
876
876
   tablespace_op(rhs.tablespace_op),
877
 
@@ -1653,6 +1656,7 @@
 
877
@@ -1654,6 +1657,7 @@
878
878
   list_copy_and_replace_each_value(alter_list, mem_root);
879
879
   list_copy_and_replace_each_value(key_list, mem_root);
880
880
   list_copy_and_replace_each_value(create_list, mem_root);
1300
1300
 
1301
1301
 /* Ignore posix_fadvise() on those platforms where it does not exist */
1302
1302
 #if defined __WIN__
1303
 
@@ -2672,6 +2673,9 @@
 
1303
@@ -2673,6 +2674,9 @@
1304
1304
                }
1305
1305
        }
1306
1306