diff options
| author | monty@donna.mysql.com <> | 2001-02-13 12:40:31 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2001-02-13 12:40:31 +0200 |
| commit | 7de40020d7684af7ec139455ca99ce6480f434e0 (patch) | |
| tree | 9cf9d3143b5b610ceb70f384c70b2b444eacc2ac /sql | |
| parent | 68895278e4ab115c300e363dce2e69d5504d6651 (diff) | |
| parent | fbedc9719eed4c1c55f57a93c11ab5c3edfc8cc9 (diff) | |
| download | mariadb-git-7de40020d7684af7ec139455ca99ce6480f434e0.tar.gz | |
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index bad9c7c355c..7e23c2784e5 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1870,7 +1870,7 @@ double Item_func_match::val() if (ft_handler==NULL) init_search(1); - if (null_value=(ft_handler==NULL)) + if ((null_value= (ft_handler==NULL))) return 0.0; if (join_key) diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 56c8fa2557e..64d3de34d3e 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1841,9 +1841,9 @@ group_clause: group_list: group_list ',' group_ident - { if (add_group_to_list($3,(bool) 1)) YYABORT; } - | group_ident order_dir - { if (add_group_to_list($1,(bool) 1)) YYABORT; } + { if (add_group_to_list($3,(bool) 1)) YYABORT; } + | group_ident + { if (add_group_to_list($1,(bool) 1)) YYABORT; } /* ** Order by statement in select @@ -2410,7 +2410,7 @@ table_wild: { $$ = new Item_field((current_thd->client_capabilities & CLIENT_NO_SCHEMA ? NullS : $1.str),$3.str,"*"); } group_ident: - order_ident + order_ident order_dir order_ident: expr { $$=$1; } |