enforcing coding style to cause an intentional merge conflict with 4.0

sql/item_strfunc.cc

@@ -1651,7 +1651,7 @@ void Item_func_elt::fix_length_and_dec()
   if (agg_arg_collations(collation, args+1, arg_count-1))
     return;
 
-  for (uint i=1 ; i < arg_count ; i++)
+  for (uint i= 1 ; i < arg_count ; i++)
   {
     set_if_bigger(max_length,args[i]->max_length);
     set_if_bigger(decimals,args[i]->decimals);