bzr push into mysql-5.1-telco-7.0 branch (mauritz.sundell:4934 to 4935)

[Mauritz Sundell]

 4935 Mauritz Sundell	2012-06-07
      ndb - refactoring, rename of block variable
      
      Variables declared in for loop header should be
      assumed to be in same scope as loop body.
      And so names of variables declared in loop header
      should not be reused in loop body.
      This is detected in gcc47 but not in earlier gcc-versions.

    modified:
      storage/ndb/src/common/util/HashMap2.cpp
 4934 Martin Skold	2012-06-07
      Regenerated result for mysqldump, default character_set and collation now uses utf8

    modified:
      mysql-test/r/mysqldump.result
=== modified file 'storage/ndb/src/common/util/HashMap2.cpp'
--- a/storage/ndb/src/common/util/HashMap2.cpp	2011-09-07 22:50:01 +0000
+++ b/storage/ndb/src/common/util/HashMap2.cpp	2012-06-07 14:06:59 +0000
@@ -157,14 +157,14 @@ TAPTEST(HashMap2)
     /* Test iterator Api */
     HashMap2<IntIntKVPod, true, TestHeapAllocator, IntIntKVStaticMethods>::Iterator it(hash1);
 
-    IntIntKVPod* j;
+    IntIntKVPod* k;
     for (int i=0; i < 2; i++)
     {
       int count = 0;
-      while((j = it.next()))
+      while((k = it.next()))
       {
-        OK( j->b == ((j->a * 3) - i) );
-        j->b--;
+        OK( k->b == ((k->a * 3) - i) );
+        k->b--;
         count++;
       }
       OK( count == 100 );

No bundle (reason: useless for push emails).