From b6f97cb42c8734ce94893dfa001c493d3d2502a0 Mon Sep 17 00:00:00 2001
From: unknown <pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se>
Date: Fri, 22 Jul 2005 15:17:05 -0400
Subject: [PATCH] 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 | 6 ++++--
 mysql-test/t/partition_error.test   | 4 ++--
 sql/share/errmsg.txt                | 4 ++--
 sql/sql_yacc.yy                     | 1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/mysql-test/r/partition_error.result b/mysql-test/r/partition_error.result
index cb7c9b8c26e..58c42888ae7 100644
--- a/mysql-test/r/partition_error.result
+++ b/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,
diff --git a/mysql-test/t/partition_error.test b/mysql-test/t/partition_error.test
index 2e1f08abf79..219219ad882 100644
--- a/mysql-test/t/partition_error.test
+++ b/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,
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index b3784b6421d..b665ee37e38 100644
--- a/sql/share/errmsg.txt
+++ b/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 "Värden i VALUES LESS THAN måste vara strikt växande för varje partition"
 ER_INCONSISTENT_TYPE_OF_FUNCTIONS_ERROR
-        eng "VALUES %s value must be of same type as partition function"
-        swe "Värden i VALUES %s måste vara av samma typ som partitioneringsfunktionen"
+        eng "VALUES value must be of same type as partition function"
+        swe "Värden i VALUES måste 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"
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 83332023517..513022fe6b3 100644
--- a/sql/sql_yacc.yy
+++ b/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
         {