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
533d274c
Commit
533d274c
authored
13 years ago
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
intptr should be unsigned
parent
a4683379
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
include/my_global.h
include/my_global.h
+3
-3
storage/maria/ma_loghandler.c
storage/maria/ma_loghandler.c
+1
-1
No files found.
include/my_global.h
View file @
533d274c
...
@@ -972,11 +972,11 @@ typedef unsigned long long my_ulonglong;
...
@@ -972,11 +972,11 @@ typedef unsigned long long my_ulonglong;
#endif
#endif
#if SIZEOF_CHARP == SIZEOF_INT
#if SIZEOF_CHARP == SIZEOF_INT
typedef
int
intptr
;
typedef
unsigned
int
intptr
;
#elif SIZEOF_CHARP == SIZEOF_LONG
#elif SIZEOF_CHARP == SIZEOF_LONG
typedef
long
intptr
;
typedef
unsigned
long
intptr
;
#elif SIZEOF_CHARP == SIZEOF_LONG_LONG
#elif SIZEOF_CHARP == SIZEOF_LONG_LONG
typedef
long
long
intptr
;
typedef
unsigned
long
long
intptr
;
#else
#else
#error sizeof(void *) is neither sizeof(int) nor sizeof(long) nor sizeof(long long)
#error sizeof(void *) is neither sizeof(int) nor sizeof(long) nor sizeof(long long)
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
storage/maria/ma_loghandler.c
View file @
533d274c
...
@@ -9038,7 +9038,7 @@ static uchar *dump_chunk(uchar *buffer, uchar *ptr)
...
@@ -9038,7 +9038,7 @@ static uchar *dump_chunk(uchar *buffer, uchar *ptr)
}
}
{
{
intptr
offset
=
ptr
-
buffer
;
intptr
offset
=
ptr
-
buffer
;
DBUG_ASSERT
(
offset
>=
0
&&
offset
<=
UINT_MAX16
);
DBUG_ASSERT
(
offset
<=
UINT_MAX16
);
length
=
translog_get_total_chunk_length
(
buffer
,
(
uint16
)
offset
);
length
=
translog_get_total_chunk_length
(
buffer
,
(
uint16
)
offset
);
}
}
printf
(
" Length %u
\n
"
,
length
);
printf
(
" Length %u
\n
"
,
length
);
...
...
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