Use default character set for expressions

- Force usage of () around complex DEFAULT expressions
- Give error if DEFAULT expression contains invalid characters
- Don't use const_charset_conversion for stored Item_func_sysconf expressions
  as the result is not constaint over different executions
- Fixed Item_func_user() to not store calculated value in str_value

1 files changed, 2 insertions, 2 deletions

diff --git a/mysql-test/suite/rpl/r/rpl_default.result b/mysql-test/suite/rpl/r/rpl_default.result
index 5edd01a60b2..a1629b99bb3 100644
--- a/mysql-test/suite/rpl/r/rpl_default.result
+++ b/mysql-test/suite/rpl/r/rpl_default.result
@@ -1,14 +1,14 @@
 include/master-slave.inc
 [connection master]
 connection master;
-create table t1 (a int DEFAULT 1+1, b bigint default uuid_short(), u blob default user());
+create table t1 (a int DEFAULT (1+1), b bigint default uuid_short(), u blob default user());
 insert into t1 (a) values(1);
 connection slave;
 connection slave;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT 1+1,
+  `a` int(11) DEFAULT (1+1),
   `b` bigint(20) DEFAULT uuid_short(),
   `u` blob DEFAULT user()
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1