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
d5d89bcf
Commit
d5d89bcf
authored
Sep 28, 2006
by
jimw@rama.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix merge of __attribute__ cleanup.
parent
68eadc8a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
include/my_sys.h
include/my_sys.h
+1
-1
sql/set_var.cc
sql/set_var.cc
+2
-2
No files found.
include/my_sys.h
View file @
d5d89bcf
...
@@ -632,7 +632,7 @@ extern int my_chsize(File fd,my_off_t newlength, int filler, myf MyFlags);
...
@@ -632,7 +632,7 @@ extern int my_chsize(File fd,my_off_t newlength, int filler, myf MyFlags);
extern
int
my_sync
(
File
fd
,
myf
my_flags
);
extern
int
my_sync
(
File
fd
,
myf
my_flags
);
extern
int
my_error
_VARARGS
((
int
nr
,
myf
MyFlags
,
...));
extern
int
my_error
_VARARGS
((
int
nr
,
myf
MyFlags
,
...));
extern
int
my_printf_error
_VARARGS
((
uint
my_err
,
const
char
*
format
,
extern
int
my_printf_error
_VARARGS
((
uint
my_err
,
const
char
*
format
,
myf
MyFlags
,
...)
myf
MyFlags
,
...)
)
ATTRIBUTE_FORMAT
(
printf
,
2
,
4
);
ATTRIBUTE_FORMAT
(
printf
,
2
,
4
);
extern
int
my_error_register
(
const
char
**
errmsgs
,
int
first
,
int
last
);
extern
int
my_error_register
(
const
char
**
errmsgs
,
int
first
,
int
last
);
extern
const
char
**
my_error_unregister
(
int
first
,
int
last
);
extern
const
char
**
my_error_unregister
(
int
first
,
int
last
);
...
...
sql/set_var.cc
View file @
d5d89bcf
...
@@ -1255,8 +1255,8 @@ static void fix_tx_isolation(THD *thd, enum_var_type type)
...
@@ -1255,8 +1255,8 @@ static void fix_tx_isolation(THD *thd, enum_var_type type)
thd
->
variables
.
tx_isolation
);
thd
->
variables
.
tx_isolation
);
}
}
static
void
fix_completion_type
(
THD
*
thd
__attribute__
(
unused
),
static
void
fix_completion_type
(
THD
*
thd
__attribute__
(
(
unused
)
),
enum_var_type
type
__attribute__
(
unused
))
{}
enum_var_type
type
__attribute__
(
(
unused
)
))
{}
static
int
check_completion_type
(
THD
*
thd
,
set_var
*
var
)
static
int
check_completion_type
(
THD
*
thd
,
set_var
*
var
)
{
{
...
...
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