diff options
| author | monty@narttu.mysql.fi <> | 2007-01-27 03:46:45 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2007-01-27 03:46:45 +0200 |
| commit | 8a80e36ac3facdfba626fd758b6e4490d3ea9ddf (patch) | |
| tree | 7a54aa50f6bf549d049cd400fe056d244cfc7eb8 /server-tools/instance-manager | |
| parent | c022454e7c5690330ed78664443e65b3511649b8 (diff) | |
| parent | 120e3f5ee1a5f2d62f6a4ff10db0797c5ac42287 (diff) | |
| download | mariadb-git-8a80e36ac3facdfba626fd758b6e4490d3ea9ddf.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
Diffstat (limited to 'server-tools/instance-manager')
| -rw-r--r-- | server-tools/instance-manager/mysql_connection.cc | 7 | ||||
| -rw-r--r-- | server-tools/instance-manager/options.cc | 14 |
2 files changed, 10 insertions, 11 deletions
diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc index ad1693e4fe7..8afa7fdc744 100644 --- a/server-tools/instance-manager/mysql_connection.cc +++ b/server-tools/instance-manager/mysql_connection.cc @@ -297,16 +297,15 @@ int Mysql_connection::dispatch_command(enum enum_server_command command, (unsigned long) connection_id, (const char *) packet); - if (Command *command= parse_command(packet)) + if (Command *com= parse_command(packet)) { int res= 0; log_info("Connection %lu: query parsed successfully.", (unsigned long) connection_id); - res= command->execute(&net, connection_id); - delete command; - + res= com->execute(&net, connection_id); + delete com; if (!res) { log_info("Connection %lu: query executed successfully", diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc index d46b2736b26..74e7812ea72 100644 --- a/server-tools/instance-manager/options.cc +++ b/server-tools/instance-manager/options.cc @@ -464,28 +464,28 @@ int Options::load(int argc, char **argv) '.angel.pid'. */ - char *angel_pid_file_name; + char *local_angel_pid_file_name; char *base_name_ptr; char *ext_ptr; - angel_pid_file_name= + local_angel_pid_file_name= (char *) malloc(strlen(Options::Main::pid_file_name) + ANGEL_PID_FILE_SUFFIX_LEN); - strcpy(angel_pid_file_name, Options::Main::pid_file_name); + strcpy(local_angel_pid_file_name, Options::Main::pid_file_name); - base_name_ptr= strrchr(angel_pid_file_name, '/'); + base_name_ptr= strrchr(local_angel_pid_file_name, '/'); if (!base_name_ptr) - base_name_ptr= angel_pid_file_name + 1; + base_name_ptr= local_angel_pid_file_name + 1; ext_ptr= strrchr(base_name_ptr, '.'); if (ext_ptr) *ext_ptr= 0; - strcat(angel_pid_file_name, ANGEL_PID_FILE_SUFFIX); + strcat(local_angel_pid_file_name, ANGEL_PID_FILE_SUFFIX); - Options::Daemon::angel_pid_file_name= angel_pid_file_name; + Options::Daemon::angel_pid_file_name= local_angel_pid_file_name; } else { |