From: Alexander Barkov
Date: June 5 2012 7:23pm
Subject: bzr push into mysql-trunk branch (alexander.barkov:3966 to 3967)
List-Archive: http://lists.mysql.com/commits/144100
Message-Id: <201206051930.q55JULaV008312@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3967 Alexander Barkov	2012-06-05
      Fixing C++ comments in C code.

    modified:
      strings/ctype-uca.c
 3966 Vasil Dimov	2012-06-05
      Followup to WL#6189 Turn InnoDB persistent statistics ON by default
      
      Adjust mtr tests, part 24.
      
      Persistent stats use a different sampling algorithm so it is possible
      that the stats numbers differ from transient stats.
      
      Also, persistent stats are updated less frequently or with a delay, so
      it is possible that persistent stats are not up to date as transient were
      even if both algorithms would return the same results.
      
      The order of the returned rows by a SELECT query depends on the stats and
      thus, if possible, we fix tests by prepending "-- sorted_result" to SELECTs
      that happen to return rows in different order.
      
      If possible, each failing test was fixed by manually running ANALYZE TABLE.
      This is doable if both transient and persistent sampling algorithms end up
      with the same numbers for the given table and its data.
      
      If persistent stats result in different stats, then test failures were fixed
      by forcing the usage of transient stats for the table by using
      CREATE TABLE ... STATS_PERSISTENT=0.
      
      Intentionally do not fix the tests by using persistent stats and adjustin
      the output of EXPLAIN in .result files because a different execution plan
      may cause a different code path to be executed, than the one originally
      intended in the test.

    modified:
      mysql-test/suite/engines/funcs/r/se_join_default.result
      mysql-test/suite/engines/funcs/t/se_join_cross.test
      mysql-test/suite/engines/funcs/t/se_join_default.test
      mysql-test/suite/engines/funcs/t/se_join_inner.test
      mysql-test/suite/engines/funcs/t/se_join_left.test
      mysql-test/suite/engines/funcs/t/se_join_left_outer.test
      mysql-test/suite/engines/funcs/t/se_join_natural_left.test
      mysql-test/suite/engines/funcs/t/se_join_natural_left_outer.test
      mysql-test/suite/engines/funcs/t/se_join_natural_right.test
      mysql-test/suite/engines/funcs/t/se_join_natural_right_outer.test
      mysql-test/suite/engines/funcs/t/se_join_right.test
      mysql-test/suite/engines/funcs/t/se_join_right_outer.test
      mysql-test/suite/engines/funcs/t/se_join_straight.test
=== modified file 'strings/ctype-uca.c'
--- a/strings/ctype-uca.c	2012-06-05 09:21:53 +0000
+++ b/strings/ctype-uca.c	2012-06-05 19:22:56 +0000
@@ -20065,7 +20065,7 @@ static int my_strnncoll_uca(const CHARSE
 
 
 static inline int
-my_space_weight(const CHARSET_INFO *cs)// W3-TODO
+my_space_weight(const CHARSET_INFO *cs) /* W3-TODO */
 {
   return cs->uca->level[0].weights[0][0x20 * cs->uca->level[0].lengths[0]];
 }
@@ -20331,7 +20331,7 @@ my_strnxfrm_uca(const CHARSET_INFO *cs,
 static int my_uca_charcmp(const CHARSET_INFO *cs, my_wc_t wc1, my_wc_t wc2)
 {
   size_t length1, length2;
-  uint16 *weight1= my_char_weight_addr(&cs->uca->level[0], wc1);// W3-TODO
+  uint16 *weight1= my_char_weight_addr(&cs->uca->level[0], wc1); /* W3-TODO */
   uint16 *weight2= my_char_weight_addr(&cs->uca->level[0], wc2);
   
   /* Check if some of the characters does not have implicit weights */
@@ -20343,7 +20343,7 @@ static int my_uca_charcmp(const CHARSET_
     return 1;
   
   /* Thoroughly compare all weights */
-  length1= cs->uca->level[0].lengths[wc1 >> MY_UCA_PSHIFT];//W3-TODO
+  length1= cs->uca->level[0].lengths[wc1 >> MY_UCA_PSHIFT]; /* W3-TODO */
   length2= cs->uca->level[0].lengths[wc2 >> MY_UCA_PSHIFT];
   
   if (length1 > length2)
@@ -21794,7 +21794,7 @@ apply_shift(MY_CHARSET_LOADER *loader,
             just in case. Reserving 4096 (0x1000) weights for such
             cases is perfectly enough.
           */
-          to[nweights - 1]+= 0x1000; //W3-TODO: const may vary on levels 2,3
+          to[nweights - 1]+= 0x1000; /* W3-TODO: const may vary on levels 2,3*/
         }
       }
       else

No bundle (reason: useless for push emails).