1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-27 01:57:48 +03:00
mariadb/server-tools/instance-manager/mysql_connection.cc
unknown f00257ddd0 Fixed compiler warnings detected by option -Wshadow and -Wunused:
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments

Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c

I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes


BUILD/SETUP.sh:
  Added printing of unused functions and variables.
  Made it easy to test compiling with -Wshadow
BUILD/compile-pentium-gcov:
  Added warnings
  Mark binary with -gcov
client/mysql.cc:
  Fixed warnings found with gcc -Wshadow
client/mysql_upgrade.c:
  Fixed warnings found with gcc -Wshadow
client/mysqlbinlog.cc:
  Fixed warnings found with gcc -Wshadow
client/mysqldump.c:
  Fixed warnings found with gcc -Wshadow
client/mysqltest.c:
  Fixed warnings found with gcc -Wshadow
client/sql_string.cc:
  Fixed warnings found with gcc -Wshadow
  Merged with sql/sql_string.cc
client/sql_string.h:
  Fixed warnings found with gcc -Wshadow
  Merged with sql/sql_string.h
cmd-line-utils/readline/display.c:
  Fixed compiler warning
cmd-line-utils/readline/histexpand.c:
  Fixed warnings found with gcc -Wshadow
cmd-line-utils/readline/input.c:
  Fixed warnings found with gcc -Wshadow
cmd-line-utils/readline/text.c:
  Fixed warnings found with gcc -Wshadow
cmd-line-utils/readline/vi_mode.c:
  Fixed warnings found with gcc -Wshadow
dbug/dbug_analyze.c:
  Fixed warnings found with gcc -Wshadow
extra/my_print_defaults.c:
  Prefixed defaults_extra_file and defaults_group_suffix with 'my' to avoid conflicts with similar named local variables
extra/yassl/include/buffer.hpp:
  Fixed compiler warnings
extra/yassl/include/crypto_wrapper.hpp:
  Fixed compiler warnings
extra/yassl/include/yassl_imp.hpp:
  Fixed compiler warnings
extra/yassl/include/yassl_int.hpp:
  Fixed compiler warnings
extra/yassl/src/crypto_wrapper.cpp:
  Fixed compiler warnings
extra/yassl/taocrypt/benchmark/benchmark.cpp:
  Fixed warnings found with gcc -Wshadow
extra/yassl/taocrypt/include/algebra.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/include/des.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/include/hash.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/include/hmac.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/include/modarith.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/include/modes.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/include/rsa.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/mySTL/list.hpp:
  Fixed compiler warnings
extra/yassl/taocrypt/src/aes.cpp:
  Fixed compiler warnings
extra/yassl/taocrypt/src/algebra.cpp:
  Fixed compiler warnings
extra/yassl/taocrypt/src/asn.cpp:
  Fixed compiler warnings
extra/yassl/taocrypt/test/test.cpp:
  Fixed compiler warnings
extra/yassl/testsuite/testsuite.cpp:
  Fixed compiler warnings
include/m_ctype.h:
  Fixed warnings found with gcc -Wshadow
include/my_pthread.h:
  Fixed warnings found with gcc -Wshadow
include/my_sys.h:
  Fixed warnings found with gcc -Wshadow
include/my_time.h:
  Fixed warnings found with gcc -Wshadow
include/mysql.h:
  Fixed warnings found with gcc -Wshadow
  Added define IS_LONGDATA() to simplify code in libmysql.c
libmysql/libmysql.c:
  Fixed warnings found with gcc -Wshadow
  (Mostly replaced bind -> my_bind and time -> my_time)
libmysqld/lib_sql.cc:
  Removed not used variables and labels
myisam/ft_boolean_search.c:
  Fixed warnings found with gcc -Wshadow
myisam/mi_open.c:
  Fixed warnings found with gcc -Wshadow
myisam/mi_search.c:
  Fixed warnings found with gcc -Wshadow
myisam/mi_unique.c:
  Fixed compiler warning
myisam/myisampack.c:
  Fixed warnings found with gcc -Wshadow
myisam/rt_index.c:
  Remove not used variables
myisam/sort.c:
  Fixed warnings found with gcc -Wshadow
mysql-test/r/mysqlcheck.result:
  Remove databases and tables possible left by previous test
mysql-test/r/mysqltest.result:
  New test results
mysql-test/t/mysql.test:
  Coverage tests
mysql-test/t/mysqlbinlog.test:
  Coverage tests
mysql-test/t/mysqlcheck.test:
  Remove databases and tables possible left by previous test
mysql-test/t/mysqltest.test:
  Coverage tests
mysys/default.c:
  Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions
mysys/mf_iocache2.c:
  Fixed warnings found with gcc -Wshadow
mysys/mf_keycache.c:
  Fixed warnings found with gcc -Wshadow
mysys/my_bitmap.c:
  Fixed warnings found with gcc -Wshadow
mysys/sha1.c:
  Fixed warnings found with gcc -Wshadow
ndb/include/kernel/signaldata/ArbitSignalData.hpp:
  Fixed compiler warning
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Fixed compiler warnings
ndb/include/ndbapi/NdbReceiver.hpp:
  Fixed warnings found with gcc -Wshadow
ndb/include/transporter/TransporterDefinitions.hpp:
  Fixed compiler warning
ndb/include/util/InputStream.hpp:
  Fixed compiler warning
ndb/include/util/OutputStream.hpp:
  Fixed compiler warning
ndb/include/util/SimpleProperties.hpp:
  Fixed compiler warning
ndb/include/util/SocketAuthenticator.hpp:
  Fixed compiler warning
ndb/include/util/SocketServer.hpp:
  Fixed compiler warning
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/portlib/NdbTick.c:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/transporter/SHM_Transporter.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/transporter/TCP_Transporter.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/transporter/TCP_Transporter.hpp:
  Fixed compiler warning
ndb/src/common/transporter/Transporter.cpp:
  Removed not used variable
ndb/src/common/transporter/TransporterRegistry.cpp:
  Removed not used variable
ndb/src/common/util/Bitmask.cpp:
  Moved function to avoid warnings of not used function
ndb/src/common/util/ConfigValues.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/util/File.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/util/Properties.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/util/SocketClient.cpp:
  Fixed wrong return value
ndb/src/common/util/random.c:
  Fixed warnings found with gcc -Wshadow
ndb/src/common/util/socket_io.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/cw/cpcd/APIService.cpp:
  Removed not used variable
ndb/src/cw/cpcd/main.cpp:
  Removed not used variables
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Removed not used variables
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Removed not used variables
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Removed not used variable
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  Removed not used variables
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Removed not used variables
ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp:
  Removed not used variables
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Removed not used variables
ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Fixed compiler warnings
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Removed not used variables
ndb/src/kernel/blocks/suma/Suma.cpp:
  Removed not used variables
ndb/src/kernel/blocks/suma/Suma.hpp:
  Fixed compiler warnings
ndb/src/kernel/vm/MetaData.hpp:
  Fixed compiler warnings
ndb/src/mgmapi/LocalConfig.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/mgmapi/mgmapi.cpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/mgmclient/CommandInterpreter.cpp:
  Removed not used variables
ndb/src/mgmsrv/ConfigInfo.cpp:
  Fixed warnings found with gcc -Wshadow
  Removed not used variables
ndb/src/mgmsrv/ConfigInfo.hpp:
  Fixed warnings found with gcc -Wshadow
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Removed not used variables and functions
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Fixed compiler warnings
ndb/src/mgmsrv/Services.cpp:
  Removed not used variables and functions
ndb/src/mgmsrv/main.cpp:
  Removed not used variable
ndb/src/ndbapi/ClusterMgr.hpp:
  Fixed compiler warnings
ndb/src/ndbapi/Ndb.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbBlob.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbOperationExec.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbOperationSearch.cpp:
  Removed not used variables
ndb/src/ndbapi/NdbScanFilter.cpp:
  Fixed compiler warning
ndb/src/ndbapi/NdbScanOperation.cpp:
  Removed not used variables
ndb/src/ndbapi/SignalSender.cpp:
  Removed not used variables
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Removed not used variable
ndb/tools/delete_all.cpp:
  Removed not used variable
ndb/tools/desc.cpp:
  Removed not used variable
ndb/tools/drop_index.cpp:
  Removed not used variable
ndb/tools/drop_tab.cpp:
  Removed not used variable
ndb/tools/listTables.cpp:
  Removed not used variable
ndb/tools/ndb_config.cpp:
  Fixed warnings found with gcc -Wshadow
  Added missing puts(desc)
ndb/tools/restore/Restore.hpp:
  Changed delimiter to define instead of static variable, as the static variable caused a LOT of compiler warnings
  Fixed compiler warning
ndb/tools/restore/consumer.hpp:
  Fixed compiler warning
ndb/tools/restore/restore_main.cpp:
  Fixed compiler warnings
ndb/tools/select_all.cpp:
  Removed not used variables
ndb/tools/select_count.cpp:
  Removed not used variable
server-tools/instance-manager/commands.h:
  Fixed compiler warnings
server-tools/instance-manager/guardian.cc:
  Fixed compiler warnings
server-tools/instance-manager/instance_options.cc:
  Removed not used variables
server-tools/instance-manager/mysql_connection.cc:
  Fixed compiler warnings
server-tools/instance-manager/options.cc:
  Fixed compiler warnings
server-tools/instance-manager/options.h:
  Fixed compiler warnings
server-tools/instance-manager/parse.cc:
  Removed not used variable
server-tools/instance-manager/user_map.cc:
  Fixed compiler warnings
server-tools/instance-manager/user_map.h:
  Fixed compiler warnings
sql/field.cc:
  Fixed compiler warnings
sql/field.h:
  Fixed compiler warnings
sql/filesort.cc:
  Fixed compiler warnings
sql/ha_archive.cc:
  Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings
sql/ha_archive.h:
  Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings
sql/ha_federated.cc:
  Fixed compiler warnings
sql/ha_heap.cc:
  Fixed compiler warnings
sql/ha_myisam.cc:
  Fixed compiler warnings
sql/ha_myisammrg.cc:
  Fixed compiler warnings
sql/ha_ndbcluster.cc:
  Fixed compiler warnings
sql/handler.cc:
  Fixed compiler warnings
sql/item.cc:
  Fixed compiler warnings
sql/item.h:
  Fixed compiler warnings
  new_item() -> clone_item(), to avoid a lot of warnings with variable 'new_item'
  el() -> element_index()
sql/item_cmpfunc.cc:
  Fixed compiler warnings
sql/item_cmpfunc.h:
  Fixed compiler warnings
sql/item_func.cc:
  Fixed compiler warnings
sql/item_geofunc.cc:
  Fixed compiler warnings
sql/item_row.h:
  Fixed compiler warnings
sql/item_strfunc.cc:
  Fixed compiler warnings
sql/item_subselect.cc:
  Fixed compiler warnings
sql/item_subselect.h:
  Fixed compiler warnings
sql/item_sum.cc:
  Fixed compiler warnings
sql/item_timefunc.cc:
  Fixed compiler warnings
sql/log.cc:
  Fixed compiler warnings
  More comments
  Added #ifdef HAVE_REPLICATION
sql/log_event.cc:
  Fixed compiler warnings
sql/log_event.h:
  Fixed compiler warnings
sql/mysql_priv.h:
  query_id -> global_query_id, to avoid a lot of clashes with function and class variables
  start_time -> server_start_time
sql/mysqld.cc:
  Fixed compiler warnings:
  - Removed not used variables
  - Added #ifndef EMBEDDED_LIBRARY
  - Fixed shadow warnings
sql/net_serv.cc:
  Fixed compiler warnings
sql/opt_range.cc:
  range -> last_range to avoid shadow warnings
  Removed not used function print_rowid()
sql/opt_range.h:
  range -> last_range to avoid shadow warnings
sql/password.c:
  Fixed compiler warnings
sql/protocol.cc:
  Fixed compiler warnings
sql/repl_failsafe.cc:
  Fixed compiler warnings
sql/set_var.cc:
  Fixed compiler warnings
sql/set_var.h:
  type() -> show_type()
  Fixed compiler warnings
sql/slave.cc:
  Fixed compiler warnings
sql/sp_head.cc:
  Fixed compiler warnings
sql/sp_head.h:
  Fixed compiler warnings
sql/spatial.cc:
  Fixed compiler warnings
sql/spatial.h:
  length() -> geom_length() to avoid compiler warnings
  wkb_end -> wkb_last to avoid compiler warnings with local variables named 'wkb_end'
sql/sql_cache.h:
  Fixed compiler warnings
sql/sql_class.cc:
  Fixed compiler warnings
sql/sql_class.h:
  log -> log_xid() to avoid compiler warnings
  Fixed shadow compiler warnings
sql/sql_derived.cc:
  Removed not used variable
sql/sql_insert.cc:
  Fixed compiler warnings
sql/sql_lex.cc:
  Fixed compiler warnings
sql/sql_lex.h:
  res -> saved_error to make the meaning of the variable clear and avoid shadow warnings
sql/sql_load.cc:
  Fixed compiler warnings
sql/sql_parse.cc:
  Fixed compiler warnings
sql/sql_prepare.cc:
  Fixed compiler warnings
sql/sql_select.cc:
  Fixed compiler warnings
sql/sql_show.cc:
  Fixed compiler warnings
sql/sql_string.cc:
  Fixed compiler warnings
sql/sql_string.h:
  Fixed compiler warnings
sql/sql_table.cc:
  Fixed compiler warnings
sql/sql_trigger.cc:
  Fixed compiler warnings
sql/sql_trigger.h:
  table -> trigger_table to avoid warnings from local variables
sql/sql_union.cc:
  Fixed compiler warnings
  (mainly res -> saved_error)
sql-common/client.c:
  Removed not used variable
sql-common/my_time.c:
  Removed not used variable
  time -> my_time
sql/sql_update.cc:
  Removed not used variable
sql/sql_view.cc:
  Removed not used variable
sql/sql_yacc.yy:
  Removed not used variable
sql/table.cc:
  Removed not used variable
sql/tztime.cc:
  Removed not used variable
sql/unireg.cc:
  Removed not used variable
strings/ctype-bin.c:
  mblen -> mb_len to avoid compiler warnings with local variable mblen
strings/ctype-cp932.c:
  Fixed compiler warnings
strings/ctype-eucjpms.c:
  Fixed compiler warnings
strings/ctype-mb.c:
  mblen -> mb_len to avoid compiler warnings with local variable mblen
strings/ctype-simple.c:
  mblen -> mb_len to avoid compiler warnings with local variable mblen
  exp -> exponent
strings/ctype-sjis.c:
  Fixed compiler warnings
strings/ctype-uca.c:
  mblen -> mb_len to avoid compiler warnings with local variable mblen
strings/ctype-ujis.c:
  Fixed compiler warnings
strings/ctype-utf8.c:
  Fixed compiler warnings
strings/decimal.c:
  Fixed compiler warnings
strings/my_vsnprintf.c:
  Added comment
strings/strtod.c:
  Fixed compiler warnings
tests/mysql_client_test.c:
  Fixed compiler warnings
  (Biggest part of patch is to not get a conflict with global function 'bind')
2006-12-15 00:51:37 +02:00

385 lines
11 KiB
C++

/* Copyright (C) 2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma implementation
#endif
#include "mysql_connection.h"
#include "priv.h"
#include "mysql_manager_error.h"
#include "mysqld_error.h"
#include "thread_registry.h"
#include "log.h"
#include "user_map.h"
#include "protocol.h"
#include "messages.h"
#include "command.h"
#include "parse.h"
#include <mysql.h>
#include <violite.h>
#include <mysql_com.h>
#include <m_string.h>
#include <my_sys.h>
Mysql_connection_thread_args::Mysql_connection_thread_args(
struct st_vio *vio_arg,
Thread_registry &thread_registry_arg,
const User_map &user_map_arg,
ulong connection_id_arg,
Instance_map &instance_map_arg) :
vio(vio_arg)
,thread_registry(thread_registry_arg)
,user_map(user_map_arg)
,connection_id(connection_id_arg)
,instance_map(instance_map_arg)
{}
/*
MySQL connection - handle one connection with mysql command line client
See also comments in mysqlmanager.cc to picture general Instance Manager
architecture.
We use conventional technique to work with classes without exceptions:
class acquires all vital resource in init(); Thus if init() succeed,
a user must call cleanup(). All other methods are valid only between
init() and cleanup().
*/
class Mysql_connection_thread: public Mysql_connection_thread_args
{
public:
Mysql_connection_thread(const Mysql_connection_thread_args &args);
int init();
void cleanup();
void run();
~Mysql_connection_thread();
private:
Thread_info thread_info;
NET net;
struct rand_struct rand_st;
char scramble[SCRAMBLE_LENGTH + 1];
uint status;
ulong client_capabilities;
private:
/* Names are conventionally the same as in mysqld */
int check_connection();
int do_command();
int dispatch_command(enum enum_server_command command,
const char *text, uint len);
};
Mysql_connection_thread::Mysql_connection_thread(
const Mysql_connection_thread_args &args) :
Mysql_connection_thread_args(args.vio,
args.thread_registry,
args.user_map,
args.connection_id,
args.instance_map)
,thread_info(pthread_self())
{
thread_registry.register_thread(&thread_info);
}
/*
NET subsystem requieres its user to provide my_net_local_init extern
C function (exactly as declared below). my_net_local_init is called by
my_net_init and is supposed to set NET controlling variables.
See also priv.h for variables description.
*/
C_MODE_START
void my_net_local_init(NET *net)
{
net->max_packet= net_buffer_length;
net->read_timeout= net_read_timeout;
net->write_timeout= net_write_timeout;
net->retry_count= net_retry_count;
net->max_packet_size= max_allowed_packet;
}
C_MODE_END
/*
Every resource, which we can fail to acquire, is allocated in init().
This function is complementary to cleanup().
*/
int Mysql_connection_thread::init()
{
/* Allocate buffers for network I/O */
if (my_net_init(&net, vio))
return 1;
net.return_status= &status;
/* Initialize random number generator */
{
ulong seed1= (ulong) &rand_st + rand();
ulong seed2= rand() + time(0);
randominit(&rand_st, seed1, seed2);
}
/* Fill scramble - server's random message used for handshake */
create_random_string(scramble, SCRAMBLE_LENGTH, &rand_st);
/* We don't support transactions, every query is atomic */
status= SERVER_STATUS_AUTOCOMMIT;
return 0;
}
void Mysql_connection_thread::cleanup()
{
net_end(&net);
}
Mysql_connection_thread::~Mysql_connection_thread()
{
/* vio_delete closes the socket if necessary */
vio_delete(vio);
thread_registry.unregister_thread(&thread_info);
}
void Mysql_connection_thread::run()
{
log_info("accepted mysql connection %lu", connection_id);
my_thread_init();
if (check_connection())
{
my_thread_end();
return;
}
log_info("connection %lu is checked successfully", connection_id);
vio_keepalive(vio, TRUE);
while (!net.error && net.vio && !thread_registry.is_shutdown())
{
if (do_command())
break;
}
my_thread_end();
}
int Mysql_connection_thread::check_connection()
{
ulong pkt_len=0; // to hold client reply length
/* maximum size of the version string */
enum { MAX_VERSION_LENGTH= 80 };
/* buffer for the first packet */ /* packet contains: */
char buff[MAX_VERSION_LENGTH + 1 + // server version, 0-ended
4 + // connection id
SCRAMBLE_LENGTH + 2 + // scramble (in 2 pieces)
18]; // server variables: flags,
// charset number, status,
char *pos= buff;
ulong server_flags;
memcpy(pos, mysqlmanager_version, mysqlmanager_version_length + 1);
pos+= mysqlmanager_version_length + 1;
int4store((uchar*) pos, connection_id);
pos+= 4;
/*
Old clients does not understand long scrambles, but can ignore packet
tail: that's why first part of the scramble is placed here, and second
part at the end of packet (even though we don't support old clients,
we must follow standard packet format.)
*/
memcpy(pos, scramble, SCRAMBLE_LENGTH_323);
pos+= SCRAMBLE_LENGTH_323;
*pos++= '\0';
server_flags= CLIENT_LONG_FLAG | CLIENT_PROTOCOL_41 |
CLIENT_SECURE_CONNECTION;
/*
18-bytes long section for various flags/variables
Every flag occupies a bit in first half of ulong; int2store will
gracefully pick up all flags.
*/
int2store(pos, server_flags);
pos+= 2;
*pos++= (char) default_charset_info->number; // global mysys variable
int2store(pos, status); // connection status
pos+= 2;
bzero(pos, 13); // not used now
pos+= 13;
/* second part of the scramble, null-terminated */
memcpy(pos, scramble + SCRAMBLE_LENGTH_323,
SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323 + 1);
pos+= SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323 + 1;
/* write connection message and read reply */
enum { MIN_HANDSHAKE_SIZE= 2 };
if (net_write_command(&net, protocol_version, "", 0, buff, pos - buff) ||
(pkt_len= my_net_read(&net)) == packet_error ||
pkt_len < MIN_HANDSHAKE_SIZE)
{
net_send_error(&net, ER_HANDSHAKE_ERROR);
return 1;
}
client_capabilities= uint2korr(net.read_pos);
if (!(client_capabilities & CLIENT_PROTOCOL_41))
{
net_send_error_323(&net, ER_NOT_SUPPORTED_AUTH_MODE);
return 1;
}
client_capabilities|= ((ulong) uint2korr(net.read_pos + 2)) << 16;
pos= (char*) net.read_pos + 32;
/* At least one byte for username and one byte for password */
if (pos >= (char*) net.read_pos + pkt_len + 2)
{
/*TODO add user and password handling in error messages*/
net_send_error(&net, ER_HANDSHAKE_ERROR);
return 1;
}
const char *user= pos;
const char *password= strend(user)+1;
ulong password_len= *password++;
if (password_len != SCRAMBLE_LENGTH)
{
net_send_error(&net, ER_ACCESS_DENIED_ERROR);
return 1;
}
if (user_map.authenticate(user, password-user-2, password, scramble))
{
net_send_error(&net, ER_ACCESS_DENIED_ERROR);
return 1;
}
net_send_ok(&net, connection_id, NULL);
return 0;
}
int Mysql_connection_thread::do_command()
{
char *packet;
ulong packet_length;
/* We start to count packets from 0 for each new command */
net.pkt_nr= 0;
if ((packet_length=my_net_read(&net)) == packet_error)
{
/* Check if we can continue without closing the connection */
if (net.error != 3) // what is 3 - find out
return 1;
if (thread_registry.is_shutdown())
return 1;
net_send_error(&net, net.last_errno);
net.error= 0;
return 0;
}
else
{
if (thread_registry.is_shutdown())
return 1;
packet= (char*) net.read_pos;
enum enum_server_command command= (enum enum_server_command)
(uchar) *packet;
log_info("connection %lu: packet_length=%lu, command=%d",
connection_id, packet_length, command);
return dispatch_command(command, packet + 1, packet_length - 1);
}
}
int Mysql_connection_thread::dispatch_command(enum enum_server_command command,
const char *packet, uint len)
{
switch (command) {
case COM_QUIT: // client exit
log_info("query for connection %lu received quit command", connection_id);
return 1;
case COM_PING:
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 %lu : ----\n%s\n-------------------------",
connection_id,packet);
if (Command *com= parse_command(&instance_map, packet))
{
int res= 0;
log_info("query for connection %lu successefully parsed",connection_id);
res= com->execute(&net, connection_id);
delete com;
if (!res)
log_info("query for connection %lu executed ok",connection_id);
else
{
log_info("query for connection %lu executed err=%d",connection_id,res);
net_send_error(&net, res);
return 0;
}
}
else
{
net_send_error(&net,ER_OUT_OF_RESOURCES);
return 0;
}
break;
}
default:
log_info("query for connection %lu received unknown command",connection_id);
net_send_error(&net, ER_UNKNOWN_COM_ERROR);
break;
}
return 0;
}
pthread_handler_t mysql_connection(void *arg)
{
Mysql_connection_thread_args *args= (Mysql_connection_thread_args *) arg;
Mysql_connection_thread mysql_connection_thread(*args);
delete args;
if (mysql_connection_thread.init())
log_info("mysql_connection(): error initializing thread");
else
{
mysql_connection_thread.run();
mysql_connection_thread.cleanup();
}
return 0;
}
/*
vim: fdm=marker
*/