Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2171 06/05/22 15:20:40 anozdrin@stripped +6 -0
Merged.
server-tools/instance-manager/options.cc
1.35 06/05/22 15:20:37 anozdrin@stripped +5 -5
Merged.
server-tools/instance-manager/mysqlmanager.cc
1.19 06/05/22 15:20:37 anozdrin@stripped +2 -2
Merged.
server-tools/instance-manager/instance_options.cc
1.34 06/05/22 15:20:37 anozdrin@stripped +9 -5
Merged.
server-tools/instance-manager/CMakeLists.txt
1.8 06/05/22 15:20:37 anozdrin@stripped +1 -0
Merged.
mysql-test/r/im_options.result
1.2 06/05/22 15:20:37 anozdrin@stripped +7 -7
Merged.
mysql-test/r/im_instance_conf.result
1.2 06/05/22 15:20:37 anozdrin@stripped +4 -4
Merged.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: anozdrin
# Host: station.home
# Root: /mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
--- 1.1/mysql-test/r/im_instance_conf.result 2006-05-18 18:57:44 +04:00
+++ 1.2/mysql-test/r/im_instance_conf.result 2006-05-22 15:20:37 +04:00
@@ -1,6 +1,6 @@
--------------------------------------------------------------------
-server_id =1
-server_id =2
+server_id = 1
+server_id = 2
--------------------------------------------------------------------
SHOW INSTANCES;
instance_name state
@@ -20,8 +20,8 @@
mysqld2 offline
mysqld1 online
--------------------------------------------------------------------
-server_id =1
-server_id =2
+server_id = 1
+server_id = 2
--------------------------------------------------------------------
CREATE INSTANCE mysqld1;
ERROR HY000: Instance already exists
--- 1.1/mysql-test/r/im_options.result 2006-05-18 18:57:45 +04:00
+++ 1.2/mysql-test/r/im_options.result 2006-05-22 15:20:37 +04:00
@@ -1,6 +1,6 @@
--------------------------------------------------------------------
-server_id =1
-server_id =2
+server_id = 1
+server_id = 2
--------------------------------------------------------------------
SHOW VARIABLES LIKE 'server_id';
Variable_name Value
@@ -99,13 +99,13 @@
UNSET mysqld2.server_id, mysqld3.server_id, mysqld.ccc;
ERROR HY000: Bad instance name. Check that the instance with such a name exists
--------------------------------------------------------------------
-server_id =1
+server_id = 1
server_id=2
--------------------------------------------------------------------
UNSET mysqld2.server_id, mysqld3.server_id, mysqld1.ccc;
ERROR HY000: The instance is active. Stop the instance first
--------------------------------------------------------------------
-server_id =1
+server_id = 1
server_id=2
--------------------------------------------------------------------
DROP INSTANCE mysqld3;
@@ -115,7 +115,7 @@
SET mysqld2 . server_id = 222 ;
SET mysqld2 . server_id = 222 , mysqld2 . aaa , mysqld2 . bbb ;
--------------------------------------------------------------------
-server_id =1
+server_id = 1
server_id=222
--------------------------------------------------------------------
aaa
@@ -124,13 +124,13 @@
--------------------------------------------------------------------
UNSET mysqld2 . aaa , mysqld2 . bbb ;
--------------------------------------------------------------------
-server_id =1
+server_id = 1
server_id=222
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
--------------------------------------------------------------------
-server_id =1
+server_id = 1
server_id=222
--------------------------------------------------------------------
SHOW VARIABLES LIKE 'server_id';
--- 1.18/server-tools/instance-manager/mysqlmanager.cc 2006-05-22 14:05:11 +04:00
+++ 1.19/server-tools/instance-manager/mysqlmanager.cc 2006-05-22 15:20:37 +04:00
@@ -365,10 +365,10 @@
pid= getpid(); /* Get our pid. */
log_info("Angel pid file: '%s'; PID: %d.",
- (const char *) options.angel_pid_file_name,
+ (const char *) Options::Daemon::angel_pid_file_name,
(int) pid);
- create_pid_file(Options::angel_pid_file_name, pid);
+ create_pid_file(Options::Daemon::angel_pid_file_name, pid);
while (child_status == CHILD_OK && is_terminated == 0)
sigsuspend(&zeromask);
--- 1.34/server-tools/instance-manager/options.cc 2006-05-22 14:22:55 +04:00
+++ 1.35/server-tools/instance-manager/options.cc 2006-05-22 15:20:37 +04:00
@@ -67,7 +67,7 @@
my_bool Options::Daemon::run_as_service= FALSE;
const char *Options::Daemon::log_file_name= QUOTE(DEFAULT_LOG_FILE_NAME);
const char *Options::Daemon::user= NULL; /* No default value */
-const char *Options::angel_pid_file_name= NULL;
+const char *Options::Daemon::angel_pid_file_name= NULL;
const char *Options::Main::config_file= QUOTE(DEFAULT_CONFIG_FILE);
const char *
@@ -155,8 +155,8 @@
#ifndef __WIN__
{ "angel-pid-file", OPT_ANGEL_PID_FILE, "Pid file for angel process.",
- (gptr *) &Options::angel_pid_file_name,
- (gptr *) &Options::angel_pid_file_name,
+ (gptr *) &Options::Daemon::angel_pid_file_name,
+ (gptr *) &Options::Daemon::angel_pid_file_name,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
#endif
@@ -507,8 +507,8 @@
delete User_management::cmd;
#ifndef __WIN__
- if (Options::run_as_service)
- free((void *) Options::angel_pid_file_name);
+ if (Options::Daemon::run_as_service)
+ free((void *) Options::Daemon::angel_pid_file_name);
#endif
}
--- 1.33/server-tools/instance-manager/instance_options.cc 2006-05-22 14:22:55 +04:00
+++ 1.34/server-tools/instance-manager/instance_options.cc 2006-05-22 15:20:37 +04:00
@@ -89,6 +89,9 @@
mysqld_path.str= NULL;
mysqld_path.length= 0;
+ mysqld_real_path.str= NULL;
+ mysqld_real_path.length= 0;
+
memset(logs, 0, sizeof(logs));
}
@@ -206,12 +209,12 @@
int Instance_options::fill_mysqld_real_path()
{
char result[FN_REFLEN];
- char help_option[]= " --no-defaults --help";
+ LEX_STRING help_option=
+ { C_STRING_WITH_SIZE(" --no-defaults --help") };
int rc= 1;
- Buffer cmd(mysqld_path_len + sizeof(help_option));
+ Buffer cmd(mysqld_path.length + help_option.length);
- if (create_mysqld_command(&cmd, mysqld_path, mysqld_path_len,
- help_option, sizeof(help_option)))
+ if (create_mysqld_command(&cmd, &mysqld_path, &help_option))
goto err;
bzero(result, FN_REFLEN);
@@ -226,7 +229,8 @@
/* chop the path of at [OPTIONS] */
if ((options_str= strstr(result, "[OPTIONS]")))
*options_str= '\0';
- mysqld_real_path= strdup_root(&alloc, result);
+ mysqld_real_path.str= strdup_root(&alloc, result);
+ mysqld_real_path.length= strlen(mysqld_real_path.str);
}
err:
if (rc)
--- 1.7/server-tools/instance-manager/CMakeLists.txt 2006-05-11 20:16:56 +04:00
+++ 1.8/server-tools/instance-manager/CMakeLists.txt 2006-05-22 15:20:37 +04:00
@@ -9,6 +9,7 @@
instance_options.cc listener.cc log.cc manager.cc messages.cc mysql_connection.cc
mysqlmanager.cc options.cc parse.cc parse_output.cc priv.cc protocol.cc
thread_registry.cc user_map.cc imservice.cpp windowsservice.cpp
+ user_management_commands.cc
../../sql/net_serv.cc ../../sql-common/pack.c ../../sql/password.c
../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c
../../libmysql/errmsg.c)
| Thread |
|---|
| • bk commit into 5.1 tree (anozdrin:1.2171) | Alexander Nozdrin | 22 May |
