mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Remove compiler warnings
(Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #)
This commit is contained in:
@ -163,7 +163,7 @@ Mysql_connection_thread::~Mysql_connection_thread()
|
||||
|
||||
void Mysql_connection_thread::run()
|
||||
{
|
||||
log_info("accepted mysql connection %d", connection_id);
|
||||
log_info("accepted mysql connection %lu", connection_id);
|
||||
|
||||
my_thread_init();
|
||||
|
||||
@ -173,7 +173,7 @@ void Mysql_connection_thread::run()
|
||||
return;
|
||||
}
|
||||
|
||||
log_info("connection %d is checked successfully", connection_id);
|
||||
log_info("connection %lu is checked successfully", connection_id);
|
||||
|
||||
vio_keepalive(vio, TRUE);
|
||||
|
||||
@ -312,7 +312,7 @@ int Mysql_connection_thread::do_command()
|
||||
packet= (char*) net.read_pos;
|
||||
enum enum_server_command command= (enum enum_server_command)
|
||||
(uchar) *packet;
|
||||
log_info("connection %d: packet_length=%d, command=%d",
|
||||
log_info("connection %lu: packet_length=%lu, command=%d",
|
||||
connection_id, packet_length, command);
|
||||
return dispatch_command(command, packet + 1, packet_length - 1);
|
||||
}
|
||||
@ -323,27 +323,27 @@ int Mysql_connection_thread::dispatch_command(enum enum_server_command command,
|
||||
{
|
||||
switch (command) {
|
||||
case COM_QUIT: // client exit
|
||||
log_info("query for connection %d received quit command", connection_id);
|
||||
log_info("query for connection %lu received quit command", connection_id);
|
||||
return 1;
|
||||
case COM_PING:
|
||||
log_info("query for connection %d received ping command", connection_id);
|
||||
log_info("query for connection %lu received ping command", connection_id);
|
||||
net_send_ok(&net, connection_id, NULL);
|
||||
break;
|
||||
case COM_QUERY:
|
||||
{
|
||||
log_info("query for connection %d : ----\n%s\n-------------------------",
|
||||
log_info("query for connection %lu : ----\n%s\n-------------------------",
|
||||
connection_id,packet);
|
||||
if (Command *command= parse_command(&instance_map, packet))
|
||||
{
|
||||
int res= 0;
|
||||
log_info("query for connection %d successefully parsed",connection_id);
|
||||
log_info("query for connection %lu successefully parsed",connection_id);
|
||||
res= command->execute(&net, connection_id);
|
||||
delete command;
|
||||
if (!res)
|
||||
log_info("query for connection %d executed ok",connection_id);
|
||||
log_info("query for connection %lu executed ok",connection_id);
|
||||
else
|
||||
{
|
||||
log_info("query for connection %d executed err=%d",connection_id,res);
|
||||
log_info("query for connection %lu executed err=%d",connection_id,res);
|
||||
net_send_error(&net, res);
|
||||
return 0;
|
||||
}
|
||||
@ -356,7 +356,7 @@ int Mysql_connection_thread::dispatch_command(enum enum_server_command command,
|
||||
break;
|
||||
}
|
||||
default:
|
||||
log_info("query for connection %d received unknown command",connection_id);
|
||||
log_info("query for connection %lu received unknown command",connection_id);
|
||||
net_send_error(&net, ER_UNKNOWN_COM_ERROR);
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user