database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge MySQL 5.1.44 into MariaDB.

Browse Source
This commit is contained in:
unknown
2010-03-04 09:03:07 +01:00
parent f04cf03f75 62db6839b8
commit 4bf849c23c
301 changed files with 10433 additions and 2269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server-tools/instance-manager/instance_map.cc
View File

@ -117,13 +117,13 @@ static void parse_option(const char *option_str,
while (*ptr == '-')
++ptr;
strmake(option_name_buf, ptr, MAX_OPTION_LEN + 1);
strmake(option_name_buf, ptr, MAX_OPTION_LEN);
eq_pos= strchr(ptr, '=');
if (eq_pos)
{
option_name_buf[eq_pos - ptr]= 0;
strmake(option_value_buf, eq_pos + 1, MAX_OPTION_LEN + 1);
strmake(option_value_buf, eq_pos + 1, MAX_OPTION_LEN);
}
else
{

2
server-tools/instance-manager/listener.cc
View File

@ -272,7 +272,7 @@ create_unix_socket(struct sockaddr_un &unix_socket_address)
unix_socket_address.sun_family= AF_UNIX;
strmake(unix_socket_address.sun_path, Options::Main::socket_file_name,
sizeof(unix_socket_address.sun_path));
sizeof(unix_socket_address.sun_path) - 1);
unlink(unix_socket_address.sun_path); // in case we have stale socket file
/*

4
server-tools/instance-manager/options.cc
View File

@ -533,10 +533,10 @@ static int setup_windows_defaults()
return 1;
}
strmake(base_name, base_name_ptr, FN_REFLEN);
strmake(base_name, base_name_ptr, FN_REFLEN - 1);
*base_name_ptr= 0;
strmake(im_name, base_name, FN_REFLEN);
strmake(im_name, base_name, FN_REFLEN - 1);
ptr= strrchr(im_name, '.');
if (!ptr)

2
server-tools/instance-manager/user_map.cc
View File

@ -25,7 +25,7 @@
User::User(const LEX_STRING *user_name_arg, const char *password)
{
user_length= (uint8) (strmake(user, user_name_arg->str,
USERNAME_LENGTH + 1) - user);
USERNAME_LENGTH) - user);
set_password(password);
}