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
60e5493d
Commit
60e5493d
authored
Sep 28, 2005
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents
26793f30
a2749ca2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
innobase/os/os0proc.c
innobase/os/os0proc.c
+9
-0
sql/ha_innodb.cc
sql/ha_innodb.cc
+3
-3
strings/decimal.c
strings/decimal.c
+1
-1
No files found.
innobase/os/os0proc.c
View file @
60e5493d
...
...
@@ -292,6 +292,9 @@ os_awe_allocate_physical_mem(
return
(
TRUE
);
#else
UT_NOT_USED
(
n_megabytes
);
UT_NOT_USED
(
page_info
);
return
(
FALSE
);
#endif
}
...
...
@@ -349,6 +352,8 @@ os_awe_allocate_virtual_mem_window(
return
(
ptr
);
#else
UT_NOT_USED
(
size
);
return
(
NULL
);
#endif
}
...
...
@@ -476,6 +481,10 @@ os_awe_map_physical_mem_to_window(
return
(
TRUE
);
#else
UT_NOT_USED
(
ptr
);
UT_NOT_USED
(
n_mem_pages
);
UT_NOT_USED
(
page_info
);
return
(
FALSE
);
#endif
}
...
...
sql/ha_innodb.cc
View file @
60e5493d
...
...
@@ -2116,7 +2116,7 @@ innobase_rollback_to_savepoint(
/* TODO: use provided savepoint data area to store savepoint data */
longlong2str
((
ul
onglong
)
savepoint
,
name
,
36
);
longlong2str
((
ul
int
)
savepoint
,
name
,
36
);
error
=
(
int
)
trx_rollback_to_savepoint_for_mysql
(
trx
,
name
,
&
mysql_binlog_cache_pos
);
...
...
@@ -2145,7 +2145,7 @@ innobase_release_savepoint(
/* TODO: use provided savepoint data area to store savepoint data */
longlong2str
((
ul
onglong
)
savepoint
,
name
,
36
);
longlong2str
((
ul
int
)
savepoint
,
name
,
36
);
error
=
(
int
)
trx_release_savepoint_for_mysql
(
trx
,
name
);
...
...
@@ -2186,7 +2186,7 @@ innobase_savepoint(
/* TODO: use provided savepoint data area to store savepoint data */
char
name
[
64
];
longlong2str
((
ul
onglong
)
savepoint
,
name
,
36
);
longlong2str
((
ul
int
)
savepoint
,
name
,
36
);
error
=
(
int
)
trx_savepoint_for_mysql
(
trx
,
name
,
(
ib_longlong
)
0
);
...
...
strings/decimal.c
View file @
60e5493d
...
...
@@ -1033,7 +1033,7 @@ int decimal2ulonglong(decimal_t *from, ulonglong *to)
{
ulonglong
y
=
x
;
x
=
x
*
DIG_BASE
+
*
buf
++
;
if
(
unlikely
(
y
>
(
ULONGLONG_MAX
/
DIG_BASE
)
||
x
<
y
))
if
(
unlikely
(
y
>
(
(
ulonglong
)
ULONGLONG_MAX
/
DIG_BASE
)
||
x
<
y
))
{
*
to
=
y
;
return
E_DEC_OVERFLOW
;
...
...
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