diff options
author | serg@serg.mylan <> | 2004-01-22 12:55:37 +0100 |
---|---|---|
committer | serg@serg.mylan <> | 2004-01-22 12:55:37 +0100 |
commit | c4a52e4ac41a50d68a6a9b207dcb6610ffe8d70d (patch) | |
tree | f01b7353a68444f1ee1888052d646f2a738cf51e | |
parent | 905a548ee8fbd6561254631360ac050e2a9e0d03 (diff) | |
download | mariadb-git-c4a52e4ac41a50d68a6a9b207dcb6610ffe8d70d.tar.gz |
enforcing coding style to cause an intentional merge conflict with 4.0
-rw-r--r-- | sql/item_strfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 4507b2598a3..6f580317447 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1647,11 +1647,11 @@ void Item_func_elt::fix_length_and_dec() { max_length=0; decimals=0; - + 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); |