diff options
| author | unknown <mikael@dator6.(none)> | 2007-07-02 18:08:27 +0200 |
|---|---|---|
| committer | unknown <mikael@dator6.(none)> | 2007-07-02 18:08:27 +0200 |
| commit | a80b1ba2c9c29469256b77ccb69df0639cc6e9a3 (patch) | |
| tree | e967f9a5da2ff39c5f23a3272586e2f6c0f55829 /sql/sql_yacc.yy | |
| parent | de0ba5c894df8f86512d025f4196d62687efb1bb (diff) | |
| parent | ff3f8990e74e8133fb68bea7b85a60b055c9feb9 (diff) | |
| download | mariadb-git-a80b1ba2c9c29469256b77ccb69df0639cc6e9a3.tar.gz | |
Merge dator6.(none):/home/mikael/mysql_clones/mysql-5.1-opt
into dator6.(none):/home/mikael/mysql_clones/bug18198
mysql-test/t/partition_hash.test:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 3babaa2aa7a..136acf85f8c 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4097,8 +4097,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; |