Fix compile errors:

* declaration in the middle of the block in C file.
* round() is only available in C99.

mysys/tree.c

@@ -221,9 +221,10 @@ TREE_ELEMENT *tree_insert(TREE *tree, void *key, uint key_size,
   }
   if (element == &tree->null_element)
   {
+    uint alloc_size;
     if (tree->flag & TREE_ONLY_DUPS)
       return((TREE_ELEMENT *) 1);
-    uint alloc_size=sizeof(TREE_ELEMENT)+key_size+tree->size_of_element;
+    alloc_size=sizeof(TREE_ELEMENT)+key_size+tree->size_of_element;
     tree->allocated+=alloc_size;
 
     if (tree->memory_limit && tree->elements_in_tree

sql/opt_range.cc

@@ -4925,7 +4925,7 @@ ha_rows get_table_cardinality_for_index_intersect(TABLE *table)
     ha_rows d;
     double q;
     for (q= table->file->stats.records, d= 1 ; q >= 10; q/= 10, d*= 10 ) ;
-    return (ha_rows) (round(q) * d);
+    return (ha_rows) (floor(q+0.5) * d);
   } 
 }