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@stripped, 2006-11-17 16:45:29+03:00, anozdrin@alik. +8 -0
Polishing: generate more warnings and make code warnings-free.
server-tools/instance-manager/Makefile.am@stripped, 2006-11-17 16:45:27+03:00, anozdrin@alik. +1 -1
Generate more warnings.
server-tools/instance-manager/commands.cc@stripped, 2006-11-17 16:45:27+03:00, anozdrin@alik. +13 -9
Eliminate warnings.
server-tools/instance-manager/commands.h@stripped, 2006-11-17 16:45:27+03:00, anozdrin@alik. +20 -0
Eliminate warnings.
server-tools/instance-manager/instance.cc@stripped, 2006-11-17 16:45:27+03:00, anozdrin@alik. +1 -1
Eliminate warnings.
server-tools/instance-manager/mysql_connection.cc@stripped, 2006-11-17 16:45:27+03:00, anozdrin@alik. +3 -3
Eliminate warnings.
server-tools/instance-manager/parse.cc@stripped, 2006-11-17 16:45:27+03:00, anozdrin@alik. +0 -1
Eliminate warnings.
server-tools/instance-manager/user_map.cc@stripped, 2006-11-17 16:45:27+03:00, anozdrin@alik. +0 -1
Eliminate warnings.
server-tools/instance-manager/user_map.h@stripped, 2006-11-17 16:45:27+03:00, anozdrin@alik. +1 -1
Eliminate warnings.
# 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: alik.
# Root: /mnt/raid/alik/MySQL/devel/5.1-rt-im
--- 1.41/server-tools/instance-manager/Makefile.am 2006-11-17 16:45:34 +03:00
+++ 1.42/server-tools/instance-manager/Makefile.am 2006-11-17 16:45:34 +03:00
@@ -61,7 +61,7 @@ client_settings.h:
libexec_PROGRAMS= mysqlmanager
-mysqlmanager_CXXFLAGS= -Werror
+mysqlmanager_CXXFLAGS= -Wall -Wextra -Werror
mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \
manager.h manager.cc log.h log.cc \
--- 1.38/server-tools/instance-manager/commands.cc 2006-11-17 16:45:34 +03:00
+++ 1.39/server-tools/instance-manager/commands.cc 2006-11-17 16:45:34 +03:00
@@ -130,7 +130,7 @@ Instance_name::Instance_name(const LEX_S
ER_OUT_OF_RESOURCES Not enough resources to complete the operation
*/
-int Show_instances::execute(st_net *net, ulong connection_id)
+int Show_instances::execute(st_net *net, ulong /* connection_id */)
{
int err_code;
@@ -309,7 +309,8 @@ int Show_instance_status::execute_impl(s
}
-int Show_instance_status::send_ok_response(st_net *net, ulong connection_id)
+int Show_instance_status::send_ok_response(st_net *net,
+ ulong /* connection_id */)
{
if (send_eof(net) || net_flush(net))
return ER_OUT_OF_RESOURCES;
@@ -429,7 +430,8 @@ int Show_instance_options::execute_impl(
}
-int Show_instance_options::send_ok_response(st_net *net, ulong connection_id)
+int Show_instance_options::send_ok_response(st_net *net,
+ ulong /* connection_id */)
{
if (send_eof(net) || net_flush(net))
return ER_OUT_OF_RESOURCES;
@@ -512,7 +514,7 @@ Start_instance::Start_instance(const LEX
ER_OUT_OF_RESOURCES Not enough resources to complete the operation
*/
-int Start_instance::execute_impl(st_net *net, Instance *instance)
+int Start_instance::execute_impl(st_net * /* net */, Instance *instance)
{
int err_code;
@@ -553,7 +555,7 @@ Stop_instance::Stop_instance(const LEX_S
ER_OUT_OF_RESOURCES Not enough resources to complete the operation
*/
-int Stop_instance::execute_impl(st_net *net, Instance *instance)
+int Stop_instance::execute_impl(st_net * /* net */, Instance *instance)
{
int err_code;
@@ -803,7 +805,7 @@ Drop_instance::Drop_instance(const LEX_S
ER_OUT_OF_RESOURCES Not enough resources to complete the operation
*/
-int Drop_instance::execute_impl(st_net *net, Instance *instance)
+int Drop_instance::execute_impl(st_net * /* net */, Instance *instance)
{
int err_code;
@@ -899,7 +901,8 @@ int Show_instance_log::execute_impl(st_n
}
-int Show_instance_log::send_ok_response(st_net *net, ulong connection_id)
+int Show_instance_log::send_ok_response(st_net *net,
+ ulong /* connection_id */)
{
if (send_eof(net) || net_flush(net))
return ER_OUT_OF_RESOURCES;
@@ -1030,7 +1033,8 @@ int Show_instance_log_files::execute_imp
}
-int Show_instance_log_files::send_ok_response(st_net *net, ulong connection_id)
+int Show_instance_log_files::send_ok_response(st_net *net,
+ ulong /* connection_id */)
{
if (send_eof(net) || net_flush(net))
return ER_OUT_OF_RESOURCES;
@@ -1689,7 +1693,7 @@ int Unset_option::process_option(Instanc
Implementation of Syntax_error.
**************************************************************************/
-int Syntax_error::execute(st_net *net, ulong connection_id)
+int Syntax_error::execute(st_net * /* net */, ulong /* connection_id */)
{
return ER_SYNTAX_ERROR;
}
--- 1.12/server-tools/instance-manager/commands.h 2006-11-17 16:45:34 +03:00
+++ 1.13/server-tools/instance-manager/commands.h 2006-11-17 16:45:34 +03:00
@@ -38,6 +38,10 @@
class Show_instances : public Command
{
public:
+ Show_instances()
+ { }
+
+public:
int execute(st_net *net, ulong connection_id);
private:
@@ -54,6 +58,10 @@ private:
class Flush_instances : public Command
{
public:
+ Flush_instances()
+ { }
+
+public:
int execute(st_net *net, ulong connection_id);
};
@@ -311,6 +319,10 @@ private:
class Set_option : public Abstract_option_cmd
{
+public:
+ Set_option()
+ { }
+
protected:
virtual bool parse_args(const char **text);
virtual int process_option(Instance *instance, Named_value *option);
@@ -324,6 +336,10 @@ protected:
class Unset_option: public Abstract_option_cmd
{
+public:
+ Unset_option()
+ { }
+
protected:
virtual bool parse_args(const char **text);
virtual int process_option(Instance *instance, Named_value *option);
@@ -341,6 +357,10 @@ protected:
class Syntax_error : public Command
{
+public:
+ Syntax_error()
+ { }
+
public:
int execute(st_net *net, ulong connection_id);
};
--- 1.42/server-tools/instance-manager/instance.cc 2006-11-17 16:45:34 +03:00
+++ 1.43/server-tools/instance-manager/instance.cc 2006-11-17 16:45:34 +03:00
@@ -429,7 +429,7 @@ void Instance::set_crash_flag_n_wake_all
Instance::Instance(Thread_registry &thread_registry_arg):
- crashed(FALSE), configured(FALSE), thread_registry(thread_registry_arg)
+ thread_registry(thread_registry_arg), crashed(FALSE), configured(FALSE)
{
pthread_mutex_init(&LOCK_instance, 0);
pthread_cond_init(&COND_instance_stopped, 0);
--- 1.19/server-tools/instance-manager/mysql_connection.cc 2006-11-17 16:45:34 +03:00
+++ 1.20/server-tools/instance-manager/mysql_connection.cc 2006-11-17 16:45:34 +03:00
@@ -86,7 +86,7 @@ private:
int check_connection();
int do_command();
int dispatch_command(enum enum_server_command command,
- const char *text, uint len);
+ const char *text);
};
@@ -317,12 +317,12 @@ int Mysql_connection_thread::do_command(
(uchar) *packet;
log_info("connection %d: packet_length=%d, command=%d",
(int) connection_id, (int) packet_length, (int) command);
- return dispatch_command(command, packet + 1, packet_length - 1);
+ return dispatch_command(command, packet + 1);
}
}
int Mysql_connection_thread::dispatch_command(enum enum_server_command command,
- const char *packet, uint len)
+ const char *packet)
{
switch (command) {
case COM_QUIT: // client exit
--- 1.17/server-tools/instance-manager/parse.cc 2006-11-17 16:45:34 +03:00
+++ 1.18/server-tools/instance-manager/parse.cc 2006-11-17 16:45:34 +03:00
@@ -274,7 +274,6 @@ Command *parse_command(const char *text)
uint word_len;
LEX_STRING instance_name;
Command *command= 0;
- const char *saved_text= text;
Token tok1= shift_token(&text, &word_len);
--- 1.19/server-tools/instance-manager/user_map.cc 2006-11-17 16:45:34 +03:00
+++ 1.20/server-tools/instance-manager/user_map.cc 2006-11-17 16:45:34 +03:00
@@ -186,7 +186,6 @@ int User_map::load(const char *password_
2 + /* for newline */
1]; /* for trailing zero */
User *user;
- int rc= 1;
if (my_access(password_file_name, F_OK) != 0)
{
--- 1.6/server-tools/instance-manager/user_map.h 2006-11-17 16:45:34 +03:00
+++ 1.7/server-tools/instance-manager/user_map.h 2006-11-17 16:45:34 +03:00
@@ -60,7 +60,7 @@ public:
{
public:
Iterator(User_map *user_map_arg) :
- cur_idx(0), user_map(user_map_arg)
+ user_map(user_map_arg), cur_idx(0)
{ }
public:
| Thread |
|---|
| • bk commit into 5.1 tree (anozdrin:1.2367) | Alexander Nozdrin | 17 Nov |
