bzr push into mysql-5.1-telco-7.1 branch (mauritz.sundell:4707 to 4708)

[Mauritz Sundell]

 4708 Mauritz Sundell	2013-01-30 [merge]
      merge 7.0 -> 7.1

    modified:
      mysql-test/suite/ndb/include/ndb_check_unique_index.inc
 4707 Mauritz Sundell	2013-01-30 [merge]
      merge 7.0 -> 7.1

    added:
      mysql-test/suite/ndb/include/ndb_check_unique_index.inc
      mysql-test/suite/ndb/t/ndb_add_partition.cnf
    modified:
      mysql-test/suite/ndb/r/ndb_add_partition.result
      mysql-test/suite/ndb/t/ndb_add_partition.test
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
=== modified file 'mysql-test/suite/ndb/include/ndb_check_unique_index.inc'
--- a/mysql-test/suite/ndb/include/ndb_check_unique_index.inc	2013-01-30 09:37:07 +0000
+++ b/mysql-test/suite/ndb/include/ndb_check_unique_index.inc	2013-01-30 12:54:10 +0000
@@ -15,18 +15,29 @@ my $tbl = $ENV{ndb_table} or die "Missin
 my $cmd = "$ENV{NDB_DESC} -d$db $tbl";
 
 my $fragcnt;
+my %idxfragcnts;
 open MAIN, "$cmd|";
 print "Table: $db.$tbl\n";
 while (<MAIN>)
 {
   if (/FragmentCount: (\S+).*/)
   {
+    # print previous tables indices fragment counts
+    foreach my $i (sort keys %idxfragcnts)
+    {
+      print $i;
+      print $idxfragcnts{$i};
+    }
+    # clear current tables indices fragment counts
+    %idxfragcnts = undef;
+    # print current tables fragment count
     print;
     $fragcnt = $1;
   }
   if (/([^(]+unique)\S+ - UniqueHashIndex.*/)
   {
-    print;
+    my $row = $_;
+    $idxfragcnts{$row} = '';
     my $index = $1;
     open IDX, "$ENV{NDB_DESC} -d$db -t$tbl $index|"
       or die "FAILED: $ENV{NDB_DESC} -d$db -t$tbl $index|";
@@ -34,12 +45,18 @@ while (<MAIN>)
     {
       if (/FragmentCount: (\S+).*/)
       {
-        print;
+        $idxfragcnts{$row} = $_;
       }
     }
     close IDX;
   }
 }
+# print last tables indices fragment counts
+foreach my $i (sort keys %idxfragcnts)
+{
+  print $i;
+  print $idxfragcnts{$i};
+}
 close MAIN;
 EOF
 

No bundle (reason: useless for push emails).