diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-05 03:37:41 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-05 03:37:41 +0500 |
| commit | 95c5287664a0538af5b49b2c58f027028779ef03 (patch) | |
| tree | 6aba922cfa41f2f0966e02b94e451c81c978fa3c /sql/sql_yacc.yy | |
| parent | 48782e344c4410ad05ac0a2244aff7c943aa3c39 (diff) | |
| parent | 285acf57ea2f08cdec214c4530e51394e8fe6b34 (diff) | |
| download | mariadb-git-95c5287664a0538af5b49b2c58f027028779ef03.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.1
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/item.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_show.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 3bd930f6041..df83e1d2e25 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4107,8 +4107,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; |