diff options
author | unknown <mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-04-14 17:48:27 -0400 |
---|---|---|
committer | unknown <mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-04-14 17:48:27 -0400 |
commit | 0988e2c80f102387f6bb1d17e21a3bf2d0ba04bc (patch) | |
tree | 2e64bfe875e52767f1141172ddb81a2c93145b0d /sql/sql_yacc.yy | |
parent | a7296d9202e6672f3fb63b0d6e993deef79b775d (diff) | |
parent | 77e01332cabac12e942c016ec383eaa2c1179000 (diff) | |
download | mariadb-git-0988e2c80f102387f6bb1d17e21a3bf2d0ba04bc.tar.gz |
Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
mysql-test/t/partition.test:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/partition.result:
manual merge
sql/share/errmsg.txt:
manual merge
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r-- | sql/sql_yacc.yy | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index f570cbcd782..2f91472ad2d 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3721,6 +3721,11 @@ part_func_max: yyerror(ER(ER_PARTITION_MAXVALUE_ERROR)); YYABORT; } + if (Lex->part_info->curr_part_elem->has_null_value) + { + yyerror(ER(ER_NULL_IN_VALUES_LESS_THAN)); + YYABORT; + } } ; |