diff options
| author | unknown <mikael@dator6.(none)> | 2007-06-13 16:03:18 +0200 |
|---|---|---|
| committer | unknown <mikael@dator6.(none)> | 2007-06-13 16:03:18 +0200 |
| commit | 43fb390959fab00de4b5fa29a9c027e5cd64278a (patch) | |
| tree | 653b319560f6cfefe911b91ef0a72ab1abbc4ec9 /sql/sql_yacc.yy | |
| parent | 73016f8f90edecb433e7ebbf09f0b261c19dce84 (diff) | |
| parent | e0c0cdc3faa34546479dd7d81099bc90126484d3 (diff) | |
| download | mariadb-git-43fb390959fab00de4b5fa29a9c027e5cd64278a.tar.gz | |
Merge dator6.(none):/home/mikael/mysql_clones/clean-mysql-5.1
into dator6.(none):/home/mikael/mysql_clones/bug18198
mysql-test/t/partition_hash.test:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item.h:
manual merge
sql/item_cmpfunc.h:
manual merge
sql/item_func.h:
manual merge
sql/item_strfunc.h:
manual merge
sql/item_timefunc.h:
manual merge
sql/item_xmlfunc.h:
manual merge
sql/partition_info.cc:
manual merge
sql/sql_partition.cc:
manual merge
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 1073c8141df..782095ab713 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4096,8 +4096,7 @@ part_bit_expr: } Lex->part_info->curr_part_elem->has_null_value= TRUE; } - else if (part_expr->result_type() != INT_RESULT && - !part_expr->null_value) + else if (part_expr->result_type() != INT_RESULT) { my_parse_error(ER(ER_INCONSISTENT_TYPE_OF_FUNCTIONS_ERROR)); MYSQL_YYABORT; |