Simple cleanups

mysql-test/t/auto_increment.test

@@ -82,7 +82,7 @@ insert into t1 values (NULL);
 select * from t1;
 drop table t1;
 
-create table t1 (a int not null auto_increment primary key) /*!41002 type=heap */;
+create table t1 (a int not null auto_increment primary key) /*!40102 type=heap */;
 insert into t1 values (NULL);
 insert into t1 values (-1);
 select last_insert_id();

sql/opt_range.cc

@@ -1076,7 +1076,6 @@ get_mm_leaf(PARAM *param, Field *field, KEY_PART *key_part,
       all rows between 'X' and 'X           ...'
     */
     uint length= uint2korr(str+maybe_null);
-    char *end;
     str2= str+ key_part->part_length + maybe_null;
     /* remove end space */
     while (length > 0 && str[length+HA_KEY_BLOB_LENGTH+maybe_null-1] == ' ')

sql/sql_select.cc

@@ -1771,10 +1771,7 @@ update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,JOIN_TAB *join_tab,
 		    uint tables, COND *cond, table_map normal_tables)
 {
   uint	and_level,i,found_eq_constant;
-
-  {
-    KEY_FIELD *key_fields,*end;
-    KEY_FIELD *field;
+  KEY_FIELD *key_fields, *end, *field;
 
   if (!(key_fields=(KEY_FIELD*)
 	thd->alloc(sizeof(key_fields[0])*(thd->cond_count+1)*2)))
@@ -1805,7 +1802,6 @@ update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,JOIN_TAB *join_tab,
   /* fill keyuse with found key parts */
   for (; field != end ; field++)
     add_key_part(keyuse,field);
-  }
 
   if (thd->lex.select->ftfunc_list.elements)
   {