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
8607842e
Commit
8607842e
authored
19 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
parents
da0f9ece
c8c29f2d
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
5 deletions
+8
-5
server-tools/instance-manager/buffer.cc
server-tools/instance-manager/buffer.cc
+2
-0
server-tools/instance-manager/buffer.h
server-tools/instance-manager/buffer.h
+2
-2
server-tools/instance-manager/commands.cc
server-tools/instance-manager/commands.cc
+2
-2
server-tools/instance-manager/user_map.cc
server-tools/instance-manager/user_map.cc
+2
-1
No files found.
server-tools/instance-manager/buffer.cc
View file @
8607842e
...
...
@@ -21,6 +21,8 @@
#include "buffer.h"
#include <m_string.h>
const
uint
Buffer
::
BUFFER_INITIAL_SIZE
=
4096
;
const
uint
Buffer
::
MAX_BUFFER_SIZE
=
16777216
;
/*
Puts the given string to the buffer.
...
...
This diff is collapsed.
Click to expand it.
server-tools/instance-manager/buffer.h
View file @
8607842e
...
...
@@ -33,9 +33,9 @@
class
Buffer
{
private:
enum
{
BUFFER_INITIAL_SIZE
=
4096
}
;
static
const
uint
BUFFER_INITIAL_SIZE
;
/* maximum buffer size is 16Mb */
enum
{
MAX_BUFFER_SIZE
=
16777216
}
;
static
const
uint
MAX_BUFFER_SIZE
;
size_t
buffer_size
;
/* Error flag. Triggered if we get an error of some kind */
int
error
;
...
...
This diff is collapsed.
Click to expand it.
server-tools/instance-manager/commands.cc
View file @
8607842e
...
...
@@ -695,9 +695,9 @@ Set_option::Set_option(Instance_map *instance_map_arg,
int
Set_option
::
correct_file
(
int
skip
)
{
int
error
;
const
static
int
mysys_to_im_error
[]
=
{
0
,
ER_OUT_OF_RESOURCES
,
static
const
int
mysys_to_im_error
[]
=
{
0
,
ER_OUT_OF_RESOURCES
,
ER_ACCESS_OPTION_FILE
};
int
error
;
error
=
modify_defaults_file
(
Options
::
config_file
,
option
,
option_value
,
instance_name
,
skip
);
...
...
This diff is collapsed.
Click to expand it.
server-tools/instance-manager/user_map.cc
View file @
8607842e
...
...
@@ -66,7 +66,8 @@ int User::init(const char *line)
*/
if
(
password
[
strlen
(
password
)
-
2
]
==
'\r'
)
line_ending_len
=
2
;
if
(
strlen
(
password
)
!=
SCRAMBLED_PASSWORD_CHAR_LENGTH
+
line_ending_len
)
if
(
strlen
(
password
)
!=
(
uint
)
(
SCRAMBLED_PASSWORD_CHAR_LENGTH
+
line_ending_len
))
goto
err
;
memcpy
(
user
,
name_begin
,
user_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