diff options
| author | unknown <guilhem@production.mysql.com> | 2006-03-13 15:45:57 +0100 |
|---|---|---|
| committer | unknown <guilhem@production.mysql.com> | 2006-03-13 15:45:57 +0100 |
| commit | 3debde2b2ba3db45b6e3ab60bd0c3248bf7c09b8 (patch) | |
| tree | fb2d4ee0f74af765f4032bbf41ca179b50ea4ca4 /sql/sql_yacc.yy | |
| parent | 27b070967771b7599f9ed90c72f4751e04f2436c (diff) | |
| parent | b9f6f9bc64bb827759e9f39ab53eb41de76171bd (diff) | |
| download | mariadb-git-3debde2b2ba3db45b6e3ab60bd0c3248bf7c09b8.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into production.mysql.com:/usersnfs/gbichot/mysql-5.1-new
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index a2e8f10d706..d654020ebd9 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -6425,6 +6425,8 @@ simple_expr: if (udf->type == UDFTYPE_AGGREGATE) Select->in_sum_expr--; + Lex->binlog_row_based_if_mixed= 1; + switch (udf->returns) { case STRING_RESULT: if (udf->type == UDFTYPE_FUNCTION) |