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
fc1bcdf5
Commit
fc1bcdf5
authored
Jun 19, 2006
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polishing: C_STRING_WITH_SIZE() was renamed to C_STRING_WITH_LEN().
parent
f118cb49
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
include/m_string.h
include/m_string.h
+1
-1
server-tools/instance-manager/commands.cc
server-tools/instance-manager/commands.cc
+3
-3
server-tools/instance-manager/instance.cc
server-tools/instance-manager/instance.cc
+1
-1
server-tools/instance-manager/instance_options.cc
server-tools/instance-manager/instance_options.cc
+3
-3
server-tools/instance-manager/priv.cc
server-tools/instance-manager/priv.cc
+1
-1
No files found.
include/m_string.h
View file @
fc1bcdf5
...
@@ -256,6 +256,6 @@ typedef struct
...
@@ -256,6 +256,6 @@ typedef struct
}
LEX_STRING
;
}
LEX_STRING
;
#define STRING_WITH_LEN(X) (X), ((uint) (sizeof(X) - 1))
#define STRING_WITH_LEN(X) (X), ((uint) (sizeof(X) - 1))
#define C_STRING_WITH_
SIZE
(X) ((char *) (X)), ((uint) (sizeof(X) - 1))
#define C_STRING_WITH_
LEN
(X) ((char *) (X)), ((uint) (sizeof(X) - 1))
#endif
#endif
server-tools/instance-manager/commands.cc
View file @
fc1bcdf5
...
@@ -695,7 +695,7 @@ bool Create_instance::parse_args(const char **text)
...
@@ -695,7 +695,7 @@ bool Create_instance::parse_args(const char **text)
if
(
!
option_value_str
)
if
(
!
option_value_str
)
{
{
LEX_STRING
empty_str
=
{
C_STRING_WITH_
SIZE
(
""
)
};
LEX_STRING
empty_str
=
{
C_STRING_WITH_
LEN
(
""
)
};
if
(
!
(
option_value_str
=
Named_value
::
alloc_str
(
&
empty_str
)))
if
(
!
(
option_value_str
=
Named_value
::
alloc_str
(
&
empty_str
)))
return
TRUE
;
/* out of memory during parsing. */
return
TRUE
;
/* out of memory during parsing. */
...
@@ -1511,7 +1511,7 @@ bool Set_option::parse_args(const char **text)
...
@@ -1511,7 +1511,7 @@ bool Set_option::parse_args(const char **text)
if
(
!
option_value_str
)
if
(
!
option_value_str
)
{
{
LEX_STRING
empty_str
=
{
C_STRING_WITH_
SIZE
(
""
)
};
LEX_STRING
empty_str
=
{
C_STRING_WITH_
LEN
(
""
)
};
if
(
!
(
option_value_str
=
Named_value
::
alloc_str
(
&
empty_str
)))
if
(
!
(
option_value_str
=
Named_value
::
alloc_str
(
&
empty_str
)))
return
TRUE
;
/* out of memory during parsing. */
return
TRUE
;
/* out of memory during parsing. */
...
@@ -1650,7 +1650,7 @@ bool Unset_option::parse_args(const char **text)
...
@@ -1650,7 +1650,7 @@ bool Unset_option::parse_args(const char **text)
return
TRUE
;
/* out of memory during parsing. */
return
TRUE
;
/* out of memory during parsing. */
{
{
LEX_STRING
empty_str
=
{
C_STRING_WITH_
SIZE
(
""
)
};
LEX_STRING
empty_str
=
{
C_STRING_WITH_
LEN
(
""
)
};
if
(
!
(
option_value_str
=
Named_value
::
alloc_str
(
&
empty_str
)))
if
(
!
(
option_value_str
=
Named_value
::
alloc_str
(
&
empty_str
)))
{
{
...
...
server-tools/instance-manager/instance.cc
View file @
fc1bcdf5
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
const
LEX_STRING
const
LEX_STRING
Instance
::
DFLT_INSTANCE_NAME
=
{
C_STRING_WITH_
SIZE
(
"mysqld"
)
};
Instance
::
DFLT_INSTANCE_NAME
=
{
C_STRING_WITH_
LEN
(
"mysqld"
)
};
static
const
char
*
const
INSTANCE_NAME_PREFIX
=
Instance
::
DFLT_INSTANCE_NAME
.
str
;
static
const
char
*
const
INSTANCE_NAME_PREFIX
=
Instance
::
DFLT_INSTANCE_NAME
.
str
;
static
const
int
INSTANCE_NAME_PREFIX_LEN
=
Instance
::
DFLT_INSTANCE_NAME
.
length
;
static
const
int
INSTANCE_NAME_PREFIX_LEN
=
Instance
::
DFLT_INSTANCE_NAME
.
length
;
...
...
server-tools/instance-manager/instance_options.cc
View file @
fc1bcdf5
...
@@ -120,7 +120,7 @@ int Instance_options::get_default_option(char *result, size_t result_len,
...
@@ -120,7 +120,7 @@ int Instance_options::get_default_option(char *result, size_t result_len,
{
{
int
rc
=
1
;
int
rc
=
1
;
LEX_STRING
verbose_option
=
LEX_STRING
verbose_option
=
{
C_STRING_WITH_
SIZE
(
" --no-defaults --verbose --help"
)
};
{
C_STRING_WITH_
LEN
(
" --no-defaults --verbose --help"
)
};
/* reserve space for the path + option + final '\0' */
/* reserve space for the path + option + final '\0' */
Buffer
cmd
(
mysqld_path
.
length
+
verbose_option
.
length
+
1
);
Buffer
cmd
(
mysqld_path
.
length
+
verbose_option
.
length
+
1
);
...
@@ -155,7 +155,7 @@ int Instance_options::fill_instance_version()
...
@@ -155,7 +155,7 @@ int Instance_options::fill_instance_version()
{
{
char
result
[
MAX_VERSION_LENGTH
];
char
result
[
MAX_VERSION_LENGTH
];
LEX_STRING
version_option
=
LEX_STRING
version_option
=
{
C_STRING_WITH_
SIZE
(
" --no-defaults --version"
)
};
{
C_STRING_WITH_
LEN
(
" --no-defaults --version"
)
};
int
rc
=
1
;
int
rc
=
1
;
Buffer
cmd
(
mysqld_path
.
length
+
version_option
.
length
+
1
);
Buffer
cmd
(
mysqld_path
.
length
+
version_option
.
length
+
1
);
...
@@ -210,7 +210,7 @@ int Instance_options::fill_mysqld_real_path()
...
@@ -210,7 +210,7 @@ int Instance_options::fill_mysqld_real_path()
{
{
char
result
[
FN_REFLEN
];
char
result
[
FN_REFLEN
];
LEX_STRING
help_option
=
LEX_STRING
help_option
=
{
C_STRING_WITH_
SIZE
(
" --no-defaults --help"
)
};
{
C_STRING_WITH_
LEN
(
" --no-defaults --help"
)
};
int
rc
=
1
;
int
rc
=
1
;
Buffer
cmd
(
mysqld_path
.
length
+
help_option
.
length
);
Buffer
cmd
(
mysqld_path
.
length
+
help_option
.
length
);
...
...
server-tools/instance-manager/priv.cc
View file @
fc1bcdf5
...
@@ -43,7 +43,7 @@ bool linuxthreads;
...
@@ -43,7 +43,7 @@ bool linuxthreads;
The following string must be less then 80 characters, as
The following string must be less then 80 characters, as
mysql_connection.cc relies on it
mysql_connection.cc relies on it
*/
*/
const
LEX_STRING
mysqlmanager_version
=
{
C_STRING_WITH_
SIZE
(
"1.0-beta"
)
};
const
LEX_STRING
mysqlmanager_version
=
{
C_STRING_WITH_
LEN
(
"1.0-beta"
)
};
const
unsigned
char
protocol_version
=
PROTOCOL_VERSION
;
const
unsigned
char
protocol_version
=
PROTOCOL_VERSION
;
...
...
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