Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
c276cc06
Commit
c276cc06
authored
22 years ago
by
Sinisa@sinisa.nasamreza.org
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Same patches as for 4.0. See there for details
parent
4d8d7f20
Branches unavailable
Tags unavailable
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
9 deletions
+8
-9
heap/hp_rfirst.c
heap/hp_rfirst.c
+5
-0
heap/hp_rnext.c
heap/hp_rnext.c
+0
-6
sql/sql_yacc.yy
sql/sql_yacc.yy
+3
-3
No files found.
heap/hp_rfirst.c
View file @
c276cc06
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
heap/hp_rnext.c
View file @
c276cc06
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
sql/sql_yacc.yy
View file @
c276cc06
...
...
@@ -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; }
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment