1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Same patches as for 4.0. See there for details

Browse Source
This commit is contained in:
unknown 2002-03-07 14:19:18 +02:00
parent 336fcc224e
commit 6265e94c35
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heap/hp_rfirst.c
View File

@ -21,6 +21,11 @@
int heap_rfirst(HP_INFO *info, byte *record) int heap_rfirst(HP_INFO *info, byte *record)
{ {
DBUG_ENTER("heap_rfirst"); 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_record=0;
info->current_hash_ptr=0; info->current_hash_ptr=0;
info->update=HA_STATE_PREV_FOUND; info->update=HA_STATE_PREV_FOUND;

6
heap/hp_rnext.c
View File

@ -24,12 +24,6 @@ int heap_rnext(HP_INFO *info, byte *record)
HP_SHARE *share=info->s; HP_SHARE *share=info->s;
DBUG_ENTER("heap_rnext"); DBUG_ENTER("heap_rnext");
if (!(info->s->records))
{
my_errno=HA_ERR_END_OF_FILE;
DBUG_RETURN(my_errno);
}
if (info->lastinx < 0) if (info->lastinx < 0)
DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX); DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX);

6
sql/sql_yacc.yy
View File

@ -1652,7 +1652,7 @@ simple_expr:
| BINARY expr %prec NEG { $$= new Item_func_binary($2); } | BINARY expr %prec NEG { $$= new Item_func_binary($2); }
| CAST_SYM '(' expr AS cast_type ')' { $$= create_func_cast($3, $5); } | CAST_SYM '(' expr AS cast_type ')' { $$= create_func_cast($3, $5); }
| CASE_SYM opt_expr WHEN_SYM when_list opt_else END | 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); } | CONVERT_SYM '(' expr ',' cast_type ')' { $$= create_func_cast($3, $5); }
| FUNC_ARG0 '(' ')' | FUNC_ARG0 '(' ')'
{ $$= ((Item*(*)(void))($1.symbol->create_func))();} { $$= ((Item*(*)(void))($1.symbol->create_func))();}
@ -1969,7 +1969,7 @@ sum_expr:
{ $$=new Item_sum_sum($3); } { $$=new Item_sum_sum($3); }
in_sum_expr: in_sum_expr:
{ Select->in_sum_expr++ } { Select->in_sum_expr++; }
expr expr
{ {
Select->in_sum_expr--; Select->in_sum_expr--;
@ -2042,7 +2042,7 @@ opt_pad:
join_table_list: join_table_list:
'(' join_table_list ')' { $$=$2; } '(' join_table_list ')' { $$=$2; }
| join_table { $$=$1; } | 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 STRAIGHT_JOIN join_table { $$=$3 ; $$->straight=1; }
| join_table_list INNER_SYM JOIN_SYM join_table ON expr | join_table_list INNER_SYM JOIN_SYM join_table ON expr
{ add_join_on($4,$6); $$=$4; } { add_join_on($4,$6); $$=$4; }