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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
574f850a
Commit
574f850a
authored
Sep 14, 2004
by
dlenev@brandersnatch.localdomain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Two small fixes to make -debug version usable again.
parent
0b3d7786
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
include/my_sys.h
include/my_sys.h
+1
-1
sql/sql_select.cc
sql/sql_select.cc
+0
-2
No files found.
include/my_sys.h
View file @
574f850a
...
...
@@ -738,7 +738,7 @@ extern void my_free_lock(byte *ptr,myf flags);
#define my_free_lock(A,B) my_free((A),(B))
#endif
#define alloc_root_inited(A) ((A)->min_malloc != 0)
#define clear_alloc_root(A)
{ (A)->free= (A)->used= (A)->pre_alloc= 0; }
#define clear_alloc_root(A)
bzero((void *) (A), sizeof(MEM_ROOT))
extern
void
init_alloc_root
(
MEM_ROOT
*
mem_root
,
uint
block_size
,
uint
pre_alloc_size
);
extern
gptr
alloc_root
(
MEM_ROOT
*
mem_root
,
unsigned
int
Size
);
...
...
sql/sql_select.cc
View file @
574f850a
...
...
@@ -232,8 +232,6 @@ int handle_select(THD *thd, LEX *lex, select_result *result)
result
->
abort
();
res
=
1
;
// Error sent to client
}
if
(
result
!=
lex
->
result
)
delete
result
;
DBUG_RETURN
(
res
);
}
...
...
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