Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1

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;

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);
 

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; }