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

Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base

Browse Source 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
This commit is contained in:
malff/marcsql@weblab.(none)
2007-02-28 18:14:56 -07:00
parent 8b07431927 2baf35b4fa
commit dc98aa82ab
363 changed files with 6951 additions and 700930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server-tools/instance-manager/IMService.cpp
View File

@ -13,7 +13,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#include <windows.h>
#include <winsock2.h>
#include <signal.h>
#include "IMService.h"

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

@ -212,8 +212,8 @@ void Guardian::process_instance(Instance *instance)
return;
case Instance::CRASHED: /* just regular restarts */
if (current_time - instance->last_checked <=
Options::Main::monitoring_interval)
if ((ulong) (current_time - instance->last_checked) <=
(ulong) Options::Main::monitoring_interval)
return;
if (instance->restart_counter < restart_retry)

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

@ -923,7 +923,7 @@ void Instance::remove_pid()
bool Instance::wait_for_stop()
{
int start_time= time(NULL);
int start_time= (int) time(NULL);
int finish_time= start_time + options.get_shutdown_delay();
log_info("Instance '%s': waiting for mysqld to stop "

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

@ -87,7 +87,7 @@ bool Mysql_connection::init()
/* Initialize random number generator */
{
ulong seed1= (ulong) &rand_st + rand();
ulong seed2= (ulong) rand() + time(0);
ulong seed2= (ulong) rand() + (ulong) time(0);
randominit(&rand_st, seed1, seed2);
}

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

@ -24,8 +24,8 @@
User::User(const LEX_STRING *user_name_arg, const char *password)
{
user_length= strmake(user, user_name_arg->str, USERNAME_LENGTH + 1) - user;
user_length= (uint8) (strmake(user, user_name_arg->str,
USERNAME_LENGTH + 1) - user);
set_password(password);
}
@ -59,7 +59,7 @@ int User::init(const char *line)
password= name_end + 1;
}
user_length= name_end - name_begin;
user_length= (uint8) (name_end - name_begin);
if (user_length > USERNAME_LENGTH)
{
log_error("User name is too long (%d). Max length: %d. "
@ -70,7 +70,7 @@ int User::init(const char *line)
return 1;
}
password_length= strlen(password);
password_length= (int) strlen(password);
if (password_length > SCRAMBLED_PASSWORD_CHAR_LENGTH)
{
log_error("Password is too long (%d). Max length: %d."