bzr commit into mysql-trunk branch (guilhem.bichot:3294)

[Guilhem Bichot]

#At file:///home/mysql_src/bzrrepos_new/mysql-next-mr-opt-backporting-wl4800-new2/ based on revid:guilhem.bichot@stripped

 3294 Guilhem Bichot	2011-04-14
      remove TABs in code which we're modifying anyway.

    modified:
      sql/opt_range.cc
      sql/sql_select.cc
=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2011-04-07 13:29:04 +0000
+++ b/sql/opt_range.cc	2011-04-14 11:49:41 +0000
@@ -2589,12 +2589,12 @@ int SQL_SELECT::test_quick_select(THD *t
         for (uint part=0 ; part < key_info->key_parts ;
              part++, key_parts++, key_part_info++)
         {
-          key_parts->key=		 param.keys;
-          key_parts->part=	 part;
+          key_parts->key=          param.keys;
+          key_parts->part=         part;
           key_parts->length=       key_part_info->length;
           key_parts->store_length= key_part_info->store_length;
-          key_parts->field=	 key_part_info->field;
-          key_parts->null_bit=	 key_part_info->null_bit;
+          key_parts->field=        key_part_info->field;
+          key_parts->null_bit=     key_part_info->null_bit;
           key_parts->image_type =
             (key_info->flags & HA_SPATIAL) ? Field::itMBR : Field::itRAW;
           /* Only HA_PART_KEY_SEG is used */

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2011-04-13 15:36:01 +0000
+++ b/sql/sql_select.cc	2011-04-14 11:49:41 +0000
@@ -4786,8 +4786,8 @@ make_join_statistics(JOIN *join, TABLE_L
 #endif
       {						// Empty table
         s->dependent= 0;                        // Ignore LEFT JOIN depend.
-	set_position(join,const_count++, s, NULL);
-	continue;
+        set_position(join,const_count++, s, NULL);
+        continue;
       }
       outer_join|= table->map;
       s->embedding_map= 0;
@@ -5105,7 +5105,7 @@ make_join_statistics(JOIN *join, TABLE_L
       */
       s->worst_seeks= min((double) s->found_records / 10,
                           (double) s->read_time*3);
-      if (s->worst_seeks < 2.0)			// Fix for small tables
+      if (s->worst_seeks < 2.0)                 // Fix for small tables
         s->worst_seeks= 2.0;
 
       /*
@@ -5156,7 +5156,7 @@ make_join_statistics(JOIN *join, TABLE_L
               add_alnum("cause", "impossible_on_condition");
             found_const_table_map|= s->table->map;
             s->type= JT_CONST;
-            mark_as_null_row(s->table);		// All fields are NULL
+            mark_as_null_row(s->table);         // All fields are NULL
           } 
           else 
           {


Attachment: [text/bzr-bundle] bzr/[e-mail]