diff options
| author | unknown <petr@mysql.com> | 2005-04-09 14:28:39 +0400 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-04-09 14:28:39 +0400 |
| commit | 76164b89d13331a01d5e5d03b09d3ecaf1a405c3 (patch) | |
| tree | f1c7b9a70981085aed9d00273b9b8a0dfaafa37e /server-tools/instance-manager/mysql_connection.cc | |
| parent | 7ff83a3f7f520feda32fb5cf68da54771542cc80 (diff) | |
| download | mariadb-git-76164b89d13331a01d5e5d03b09d3ecaf1a405c3.tar.gz | |
WL#2246 "IM: Add ability to change instance options, add server logs handling" ported to the
current version of the IM
server-tools/instance-manager/commands.cc:
Log and set options commands added
server-tools/instance-manager/commands.h:
Log and set options commands added
server-tools/instance-manager/factory.cc:
Log and set options factory entries added
server-tools/instance-manager/factory.h:
prototypes added
server-tools/instance-manager/instance_options.cc:
fill_log_options() added
server-tools/instance-manager/instance_options.h:
log processing options and funcctions added
server-tools/instance-manager/messages.cc:
new error messages added (log and option processing-related)
server-tools/instance-manager/mysql_connection.cc:
minor fixes
server-tools/instance-manager/mysql_manager_error.h:
new error codes added
server-tools/instance-manager/parse.cc:
parser fixed to recognize new commands. function to parse command-line options added
server-tools/instance-manager/parse.h:
header fixed in line with .cc changes
server-tools/instance-manager/parse_output.cc:
cleanup
server-tools/instance-manager/parse_output.h:
header guards added
server-tools/instance-manager/protocol.cc:
Protocol support extended to provide messages in ok packet
server-tools/instance-manager/protocol.h:
protocol support extended: ok packet could contain messages
Diffstat (limited to 'server-tools/instance-manager/mysql_connection.cc')
| -rw-r--r-- | server-tools/instance-manager/mysql_connection.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/mysql_connection.cc b/server-tools/instance-manager/mysql_connection.cc index 215dbe51b58..036d0887d18 100644 --- a/server-tools/instance-manager/mysql_connection.cc +++ b/server-tools/instance-manager/mysql_connection.cc @@ -284,7 +284,7 @@ int Mysql_connection_thread::check_connection() net_send_error(&net, ER_ACCESS_DENIED_ERROR); return 1; } - net_send_ok(&net, connection_id); + net_send_ok(&net, connection_id, NULL); return 0; } @@ -332,7 +332,7 @@ int Mysql_connection_thread::dispatch_command(enum enum_server_command command, return 1; case COM_PING: log_info("query for connection %d received ping command", connection_id); - net_send_ok(&net, connection_id); + net_send_ok(&net, connection_id, NULL); break; case COM_QUERY: { |