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
05bcc7ed
Commit
05bcc7ed
authored
Sep 29, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
parents
34b85dc5
612b9ceb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
6 deletions
+4
-6
innobase/include/mem0mem.h
innobase/include/mem0mem.h
+1
-2
innobase/include/mem0mem.ic
innobase/include/mem0mem.ic
+1
-2
sql/ha_innodb.cc
sql/ha_innodb.cc
+2
-2
No files found.
innobase/include/mem0mem.h
View file @
05bcc7ed
...
@@ -99,8 +99,7 @@ heap freeing. */
...
@@ -99,8 +99,7 @@ heap freeing. */
/*********************************************************************
/*********************************************************************
NOTE: Use the corresponding macros instead of this function. Creates a
NOTE: Use the corresponding macros instead of this function. Creates a
memory heap which allocates memory from dynamic space. For debugging
memory heap which allocates memory from dynamic space. For debugging
purposes, takes also the file name and line as argument in the debug
purposes, takes also the file name and line as argument. */
version. */
UNIV_INLINE
UNIV_INLINE
mem_heap_t
*
mem_heap_t
*
mem_heap_create_func
(
mem_heap_create_func
(
...
...
innobase/include/mem0mem.ic
View file @
05bcc7ed
...
@@ -371,8 +371,7 @@ mem_heap_free_top(
...
@@ -371,8 +371,7 @@ mem_heap_free_top(
/*********************************************************************
/*********************************************************************
NOTE: Use the corresponding macros instead of this function. Creates a
NOTE: Use the corresponding macros instead of this function. Creates a
memory heap which allocates memory from dynamic space. For debugging
memory heap which allocates memory from dynamic space. For debugging
purposes, takes also the file name and line as argument in the debug
purposes, takes also the file name and line as argument. */
version. */
UNIV_INLINE
UNIV_INLINE
mem_heap_t*
mem_heap_t*
mem_heap_create_func(
mem_heap_create_func(
...
...
sql/ha_innodb.cc
View file @
05bcc7ed
...
@@ -1191,7 +1191,7 @@ Opens an InnoDB database. */
...
@@ -1191,7 +1191,7 @@ Opens an InnoDB database. */
handlerton
*
handlerton
*
innobase_init
(
void
)
innobase_init
(
void
)
/*===============*/
/*===============*/
/* out:
TRUE if
error */
/* out:
&innobase_hton, or NULL on
error */
{
{
static
char
current_dir
[
3
];
/* Set if using current lib */
static
char
current_dir
[
3
];
/* Set if using current lib */
int
err
;
int
err
;
...
@@ -2492,7 +2492,7 @@ Closes a handle to an InnoDB table. */
...
@@ -2492,7 +2492,7 @@ Closes a handle to an InnoDB table. */
int
int
ha_innobase
::
close
(
void
)
ha_innobase
::
close
(
void
)
/*====================*/
/*====================*/
/* out:
error number
*/
/* out:
0
*/
{
{
DBUG_ENTER
(
"ha_innobase::close"
);
DBUG_ENTER
(
"ha_innobase::close"
);
...
...
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