diff options
| author | unknown <bar@mysql.com> | 2004-10-29 16:00:03 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2004-10-29 16:00:03 +0500 |
| commit | a739f2d692093accfb5babf3df9008913fdf5d3f (patch) | |
| tree | b66152e6af71b2839f39170b311d5e915b5937c6 /sql/item_func.cc | |
| parent | facda8f3ef9cbc7ca3aecd06c2477f8de27d166c (diff) | |
| download | mariadb-git-a739f2d692093accfb5babf3df9008913fdf5d3f.tar.gz | |
Allow to convert to non-Unicode charset when mixing a string
constant with a column. The string is converted into the column
character set. It conversion doesn't lose data, then operation
is possible. Otherwise, give an error, as it was earlier.
sql/item.h:
Change bool argument to uint flags:
we have now two different flags.
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 879c0b36bdd..3cb125d2868 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -76,7 +76,7 @@ static void my_coll_agg_error(Item** args, uint count, const char *fname) bool Item_func::agg_arg_collations(DTCollation &c, Item **av, uint count, - bool allow_superset_conversion) + uint flags) { uint i; c.nagg= 0; @@ -84,7 +84,7 @@ bool Item_func::agg_arg_collations(DTCollation &c, Item **av, uint count, c.set(av[0]->collation); for (i= 1; i < count; i++) { - if (c.aggregate(av[i]->collation, allow_superset_conversion)) + if (c.aggregate(av[i]->collation, flags)) { my_coll_agg_error(av, count, func_name()); return TRUE; @@ -96,9 +96,9 @@ bool Item_func::agg_arg_collations(DTCollation &c, Item **av, uint count, bool Item_func::agg_arg_collations_for_comparison(DTCollation &c, Item **av, uint count, - bool allow_superset_conv) + uint flags) { - if (agg_arg_collations(c, av, count, allow_superset_conv)) + if (agg_arg_collations(c, av, count, flags)) return TRUE; if (c.derivation == DERIVATION_NONE) |