diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result
index 42b4580643e..24c1102306f 100644
--- a/mysql-test/r/ps_2myisam.result
+++ b/mysql-test/r/ps_2myisam.result
@@ -1941,7 +1941,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select @arg01:=  c1, @arg02:=  c2, @arg03:=  c3, @arg04:=  c4,
@@ -2038,7 +2038,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -2126,7 +2126,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -2216,7 +2216,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result
index bb001fe9e02..ad2912529a5 100644
--- a/mysql-test/r/ps_3innodb.result
+++ b/mysql-test/r/ps_3innodb.result
@@ -1924,7 +1924,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select @arg01:=  c1, @arg02:=  c2, @arg03:=  c3, @arg04:=  c4,
@@ -2021,7 +2021,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -2109,7 +2109,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -2199,7 +2199,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result
index 263b389ffa4..123e3d58b38 100644
--- a/mysql-test/r/ps_4heap.result
+++ b/mysql-test/r/ps_4heap.result
@@ -1925,7 +1925,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	0	31	8
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select @arg01:=  c1, @arg02:=  c2, @arg03:=  c3, @arg04:=  c4,
@@ -2022,7 +2022,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	0	31	8
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -2110,7 +2110,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	0	31	8
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -2200,7 +2200,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	0	31	8
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result
index 0ec296717e0..e07cb7d7c49 100644
--- a/mysql-test/r/ps_5merge.result
+++ b/mysql-test/r/ps_5merge.result
@@ -1864,7 +1864,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select @arg01:=  c1, @arg02:=  c2, @arg03:=  c3, @arg04:=  c4,
@@ -1961,7 +1961,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -2049,7 +2049,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -2139,7 +2139,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -4874,7 +4874,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select @arg01:=  c1, @arg02:=  c2, @arg03:=  c3, @arg04:=  c4,
@@ -4971,7 +4971,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -5059,7 +5059,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -5149,7 +5149,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
diff --git a/mysql-test/r/ps_6bdb.result b/mysql-test/r/ps_6bdb.result
index bb28abeda69..5f2419bdda5 100644
--- a/mysql-test/r/ps_6bdb.result
+++ b/mysql-test/r/ps_6bdb.result
@@ -1924,7 +1924,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select @arg01:=  c1, @arg02:=  c2, @arg03:=  c3, @arg04:=  c4,
@@ -2021,7 +2021,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -2109,7 +2109,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -2199,7 +2199,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
diff --git a/mysql-test/r/ps_7ndb.result b/mysql-test/r/ps_7ndb.result
index 4fe7f57973f..41c55cac0ca 100644
--- a/mysql-test/r/ps_7ndb.result
+++ b/mysql-test/r/ps_7ndb.result
@@ -1924,7 +1924,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select @arg01:=  c1, @arg02:=  c2, @arg03:=  c3, @arg04:=  c4,
@@ -2021,7 +2021,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
@@ -2109,7 +2109,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 select c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,
@@ -2199,7 +2199,7 @@ def					@arg28	254	8192	10	Y	0	31	8
 def					@arg29	254	8192	8	Y	128	31	63
 def					@arg30	254	8192	8	Y	0	31	8
 def					@arg31	254	8192	3	Y	0	31	8
-def					@arg32	254	8192	6	Y	128	31	63
+def					@arg32	254	8192	6	Y	0	31	8
 @arg01	@arg02	@arg03	@arg04	@arg05	@arg06	@arg07	@arg08	@arg09	@arg10	@arg11	@arg12	@arg13	@arg14	@arg15	@arg16	@arg17	@arg18	@arg19	@arg20	@arg21	@arg22	@arg23	@arg24	@arg25	@arg26	@arg27	@arg28	@arg29	@arg30	@arg31	@arg32
 1	1	1	1	1	1	1	1	1	1	1	1	2004-02-29	2004-02-29 11:11:11	2004-02-29 11:11:11	11:11:11	2004	1	1	a	123456789a	123456789a123456789b123456789c	tinyblob	tinytext	blob	text	mediumblob	mediumtext	longblob	longtext	one	monday
 set @my_key= 0 ;
diff --git a/sql/field.cc b/sql/field.cc
index 90203d1935d..6dfddf6fd71 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -5754,6 +5754,7 @@ String *Field_set::val_str(String *val_buffer,
   uint bitnr=0;
 
   val_buffer->length(0);
+  val_buffer->set_charset(field_charset);
   while (tmp && bitnr < (uint) typelib->count)
   {
     if (tmp & 1)