diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2002-03-07 14:20:07 +0200 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2002-03-07 14:20:07 +0200 |
| commit | 2d0ab21926f12fc99465f786260a3d7f1261fc04 (patch) | |
| tree | 567e5244cdbd4ffdcfc79556cad9ccba0aded955 | |
| parent | e3d5356d4832b1ebf7e96615e991de0246bad843 (diff) | |
| parent | c276cc060a5e0ba9fe791408100498ce7b2b3166 (diff) | |
| download | mariadb-git-2d0ab21926f12fc99465f786260a3d7f1261fc04.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
| -rw-r--r-- | heap/hp_rfirst.c | 5 | ||||
| -rw-r--r-- | heap/hp_rnext.c | 6 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/heap/hp_rfirst.c b/heap/hp_rfirst.c index 9a1f09244a0..b20918ff3a7 100644 --- a/heap/hp_rfirst.c +++ b/heap/hp_rfirst.c @@ -21,6 +21,11 @@ int heap_rfirst(HP_INFO *info, byte *record) { DBUG_ENTER("heap_rfirst"); + if (!(info->s->records)) + { + my_errno=HA_ERR_END_OF_FILE; + DBUG_RETURN(my_errno); + } info->current_record=0; info->current_hash_ptr=0; info->update=HA_STATE_PREV_FOUND; diff --git a/heap/hp_rnext.c b/heap/hp_rnext.c index 7a6b6846169..af08a0e68a2 100644 --- a/heap/hp_rnext.c +++ b/heap/hp_rnext.c @@ -24,12 +24,6 @@ int heap_rnext(HP_INFO *info, byte *record) HP_SHARE *share=info->s; DBUG_ENTER("heap_rnext"); - if (!(info->s->records)) - { - my_errno=HA_ERR_END_OF_FILE; - DBUG_RETURN(my_errno); - } - if (info->lastinx < 0) DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX); diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index f91d6a48d50..41e56328613 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1652,7 +1652,7 @@ simple_expr: | BINARY expr %prec NEG { $$= new Item_func_binary($2); } | CAST_SYM '(' expr AS cast_type ')' { $$= create_func_cast($3, $5); } | CASE_SYM opt_expr WHEN_SYM when_list opt_else END - { $$= new Item_func_case(* $4, $2, $5 ) } + { $$= new Item_func_case(* $4, $2, $5 ); } | CONVERT_SYM '(' expr ',' cast_type ')' { $$= create_func_cast($3, $5); } | FUNC_ARG0 '(' ')' { $$= ((Item*(*)(void))($1.symbol->create_func))();} @@ -1969,7 +1969,7 @@ sum_expr: { $$=new Item_sum_sum($3); } in_sum_expr: - { Select->in_sum_expr++ } + { Select->in_sum_expr++; } expr { Select->in_sum_expr--; @@ -2042,7 +2042,7 @@ opt_pad: join_table_list: '(' join_table_list ')' { $$=$2; } | join_table { $$=$1; } - | join_table_list normal_join join_table { $$=$3 } + | join_table_list normal_join join_table { $$=$3; } | join_table_list STRAIGHT_JOIN join_table { $$=$3 ; $$->straight=1; } | join_table_list INNER_SYM JOIN_SYM join_table ON expr { add_join_on($4,$6); $$=$4; } |