Bug #12097 More fixes

mysql-test/r/partition_error.result:
  Fixed result files after rearranging code a bit
mysql-test/t/partition_error.test:
  Fixed result files after rearranging code a bit
sql/share/errmsg.txt:
  Fixed result files after rearranging code a bit
sql/sql_yacc.yy:
  Added initialisation

mysql-test/r/partition_error.result

@@ -290,7 +290,8 @@ partition by range (a)
 partitions 2
 (partition x1 values less than (4.0) tablespace ts1,
 partition x2 values less than (8) tablespace ts2);
-ERROR HY000: VALUES LESS THAN value must be of same type as partition function
+ERROR 42000: VALUES value must be of same type as partition function near ') tablespace ts1,
+partition x2 values less than (8) tablespace ts2)' at line 8
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -530,7 +531,8 @@ partition by list (a)
 partitions 2
 (partition x1 values in (4.0, 12+8),
 partition x2 values in (3, 21));
-ERROR HY000: VALUES IN value must be of same type as partition function
+ERROR 42000: VALUES value must be of same type as partition function near ' 12+8),
+partition x2 values in (3, 21))' at line 8
 CREATE TABLE t1 (
 a int not null,
 b int not null,

mysql-test/t/partition_error.test

@@ -389,7 +389,7 @@ partitions 2
 #
 # Partition by range, inconsistent partition function and constants
 #
---error 1450
+--error 1064
 CREATE TABLE t1 (
 a int not null,
 b int not null,
@@ -702,7 +702,7 @@ partitions 2
 #
 # Partition by list, wrong constant result type (not INT)
 #
---error 1450
+--error 1064
 CREATE TABLE t1 (
 a int not null,
 b int not null,

sql/share/errmsg.txt

@@ -5427,8 +5427,8 @@ ER_RANGE_NOT_INCREASING_ERROR
         eng "VALUES LESS THAN value must be strictly increasing for each partition"
         swe "Vrden i VALUES LESS THAN mste vara strikt vxande fr varje partition"
 ER_INCONSISTENT_TYPE_OF_FUNCTIONS_ERROR
-        eng "VALUES %s value must be of same type as partition function"
-        swe "Vrden i VALUES %s mste vara av samma typ som partitioneringsfunktionen"
+        eng "VALUES value must be of same type as partition function"
+        swe "Vrden i VALUES mste vara av samma typ som partitioneringsfunktionen"
 ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR
         eng "Multiple definition of same constant in list partitioning"
         swe "Multipel definition av samma konstant i list partitionering"

sql/sql_yacc.yy

@@ -2864,6 +2864,7 @@ part_func_max:
             YYABORT;
           }
           lex->part_info->defined_max_value= TRUE;
+          lex->part_info->curr_part_elem->range_value= LONGLONG_MAX;
         }
         | part_range_func
         {