← Back to branch summary

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

« back to all changes in this revision

Viewing changes to innodb_expand_fast_index_creation.patch

  • Committer: Oleg Tsarev
  • Date: 2011-05-11 13:27:33 UTC
  • mto: This revision was merged to the branch mainline in revision 110.
  • Revision ID: oleg.tsarev@percona.com-20110511132733-hvqta1d712hp9ozr
port to 5.5.12 second part

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_expand_fast_index_creation.patch
4
4
# Expands the applicability of InnoDB fast index creation to mysqldump,
5
5
# ALTER TABLE and OPTIMIZE TABLE.
6
6
#
 
7
#
7
8
diff -ruN a/client/client_priv.h b/client/client_priv.h
8
9
--- a/client/client_priv.h      2011-04-11 08:57:20.000000000 +0400
9
10
+++ b/client/client_priv.h      2011-04-11 08:57:21.000000000 +0400
10
 
@@ -89,6 +89,7 @@
 
11
@@ -90,6 +90,7 @@
11
12
   OPT_NO_REMOVE_EOL_CARRET,
12
13
   OPT_DEFAULT_AUTH,
13
14
   OPT_DEFAULT_PLUGIN,
524
525
 
525
526
   DBUG_ENTER("mysql_prepare_alter_table");
526
527
 
527
 
@@ -5286,6 +5314,7 @@
528
 
     char *tablespace= static_cast<char *>(thd->alloc(FN_LEN + 1));
529
 
     /*
530
 
        Regular alter table of disk stored table (no tablespace/storage change)
531
 
+
532
 
        Copy tablespace name
533
 
     */
534
 
     if (tablespace &&
535
 
@@ -5436,7 +5465,23 @@
 
528
@@ -5431,7 +5459,23 @@
536
529
   /*
537
530
     Collect all keys which isn't in drop list. Add only those
538
531
     for which some fields exists.
557
550
 
558
551
   for (uint i=0 ; i < table->s->keys ; i++,key_info++)
559
552
   {
560
 
@@ -5553,6 +5598,8 @@
 
553
@@ -5548,6 +5592,8 @@
561
554
                    test(key_info->flags & HA_GENERATED_KEY),
562
555
                    key_parts);
563
556
       new_key_list.push_back(key);
566
559
     }
567
560
   }
568
561
   {
569
 
@@ -5560,7 +5607,21 @@
 
562
@@ -5555,7 +5601,21 @@
570
563
     while ((key=key_it++))                     // Add new keys
571
564
     {
572
565
       if (key->type != Key::FOREIGN_KEY)
588
581
       if (key->name.str &&
589
582
          !my_strcasecmp(system_charset_info, key->name.str, primary_key_name))
590
583
       {
591
 
@@ -5609,12 +5670,100 @@
 
584
@@ -5604,12 +5664,100 @@
592
585
   rc= FALSE;
593
586
   alter_info->create_list.swap(new_create_list);
594
587
   alter_info->key_list.swap(new_key_list);
689
682
   Alter table
690
683
 
691
684
   SYNOPSIS
692
 
@@ -6405,19 +6554,38 @@
 
685
@@ -6400,19 +6548,38 @@
693
686
   */
694
687
   if (new_table && !(new_table->file->ha_table_flags() & HA_NO_COPY_ON_ALTER))
695
688
   {