1. Item now uses my_charset_bin by default,

not default_charset_into. It fixes the
problem that in some cases numbers where
treated as CHAR(N), not as BINARY(N), e.g.
wrong 'charsetnr' when sent to the client side.
2. IFNULL didn't aggregate argument charsets
and collations, so IFNULL(1,'a') produced
a CHAR(N). Now produces a BINARY(N).
3. SELECT PROCEDURE ANALIZE now returns
BINARY columns, which is much better than it worked
previously: CHAR with the default character set.
But in the future it's worth to fix the fields
'Field_name' and 'Optimal_fieldtype' to use UTF8,
and 'Min_value' and 'Max_value' to inherit their charsets
from the original items. But it is not important,
and BINARY(N) is OK for now.
4. Tests were fixed accordingly. No new tests were
made, as the old onces cover everything.

1 files changed, 3 insertions, 3 deletions

diff --git a/mysql-test/r/metadata.result b/mysql-test/r/metadata.result
index 3c7cf60db7a..54b3f1e0466 100644
--- a/mysql-test/r/metadata.result
+++ b/mysql-test/r/metadata.result
@@ -1,9 +1,9 @@
 drop table if exists t1,t2;
 select 1, 1.0, -1, "hello", NULL;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Name	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
-def					1	8	1	1	N	32769	0	8
-def					1.0	5	3	3	N	32769	1	8
-def					-1	8	2	2	N	32769	0	8
+def					1	8	1	1	N	32897	0	63
+def					1.0	5	3	3	N	32897	1	63
+def					-1	8	2	2	N	32897	0	63
 def					hello	254	5	5	N	1	31	8
 def					NULL	6	0	0	Y	32896	0	63
 1	1.0	-1	hello	NULL