mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 22:34:18 +01:00
f3e4ce926d
into mysql.com:/home/kent/bk/main/mysql-5.1 BUILD/Makefile.am: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~10: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~11: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~12: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~13: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~14: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~15: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~1: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~2: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~3: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~4ef559bc8b4695f7: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~4: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~5: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~6: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~7: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~84669765249a4bad: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~8: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~9: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4: Auto merged BitKeeper/deleted/.del-Makefile.am~2: Auto merged BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e: Auto merged BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6: Auto merged BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713: Auto merged BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c: Auto merged BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f: Auto merged BitKeeper/deleted/.del-Makefile.in: Auto merged BitKeeper/deleted/.del-ReadMe.txt~573b1e4ebab241e1: Auto merged BitKeeper/deleted/.del-build-vs71.bat: Auto merged BitKeeper/deleted/.del-build-vs8.bat: Auto merged BitKeeper/deleted/.del-configure.js: Auto merged BitKeeper/deleted/.del-copy_mysql_files.bat~f6878eeb80173de9: Auto merged BitKeeper/deleted/.del-ha_berkeley.cc: Auto merged BitKeeper/deleted/.del-ha_berkeley.h: Auto merged BitKeeper/deleted/.del-make_win_bin_dist: Auto merged BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1: Auto merged BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb: Auto merged BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57: Auto merged BitKeeper/deleted/.del-mysql_thr.c~20772782813d1274: Auto merged BitKeeper/deleted/.del-mysql_upgrade.sh~826da969ccf96ef: Auto merged BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Auto merged BitKeeper/deleted/.del-prepare~773a10a535120a7e: Auto merged BitKeeper/deleted/.del-print-limit-table~b8e808031daa3758: Auto merged BitKeeper/deleted/.del-sql_manager.h: Auto merged BitKeeper/deleted/.del-thr_test.c~70fc0971c72f2a95: Auto merged Docs/Makefile.am: Auto merged Docs/generate-text-files.pl: Auto merged client/Makefile.am: Auto merged client/client_priv.h: Auto merged client/mysqladmin.cc: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged dbug/Makefile.am: Auto merged extra/Makefile.am: Auto merged extra/yassl/taocrypt/benchmark/Makefile.am: Auto merged extra/yassl/taocrypt/test/Makefile.am: Auto merged include/Makefile.am: Auto merged include/my_time.h: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/embedded_priv.h: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/install_test_db.sh: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_io.pl: Auto merged mysql-test/lib/mtr_match.pl: Auto merged mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/lib/mtr_timer.pl: Auto merged mysql-test/ndb/ndbcluster.sh: Auto merged mysys/Makefile.am: Auto merged mysys/my_gethostbyname.c: Auto merged mysys/my_getopt.c: Auto merged mysys/my_handler.c: Auto merged regex/Makefile.am: Auto merged scripts/Makefile.am: Auto merged scripts/fill_func_tables.sh: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysql_convert_table_format.sh: Auto merged scripts/mysql_create_system_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sh: Auto merged scripts/mysql_install_db.sh: Auto merged server-tools/instance-manager/IMService.cpp: Auto merged server-tools/instance-manager/WindowsService.cpp: Auto merged server-tools/instance-manager/listener.cc: Auto merged server-tools/instance-manager/log.cc: Auto merged server-tools/instance-manager/log.h: Auto merged server-tools/instance-manager/manager.cc: Auto merged server-tools/instance-manager/messages.cc: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged server-tools/instance-manager/mysqlmanager.cc: Auto merged server-tools/instance-manager/options.cc: Auto merged server-tools/instance-manager/options.h: Auto merged server-tools/instance-manager/portability.h: Auto merged server-tools/instance-manager/priv.cc: Auto merged server-tools/instance-manager/protocol.cc: Auto merged server-tools/instance-manager/protocol.h: Auto merged server-tools/instance-manager/thread_registry.cc: Auto merged server-tools/instance-manager/thread_registry.h: Auto merged server-tools/instance-manager/user_map.cc: Auto merged server-tools/instance-manager/user_map.h: Auto merged sql/Makefile.am: Auto merged sql/discover.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/init.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.h: Auto merged sql/item_geofunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.h: Auto merged sql/item_uniq.cc: Auto merged sql/key.cc: Auto merged sql/lex_symbol.h: Auto merged sql/lock.cc: Auto merged sql/log_event.h: Auto merged sql/my_decimal.cc: Auto merged sql/my_decimal.h: Auto merged sql/my_lock.c: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/password.c: Auto merged sql/procedure.h: Auto merged sql/protocol.h: Auto merged sql/records.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.h: Auto merged sql/spatial.h: Auto merged sql/sql_acl.h: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_analyse.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_crypt.cc: Auto merged sql/sql_cursor.cc: Auto merged sql/sql_do.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_manager.cc: Auto merged sql/sql_map.cc: Auto merged sql/sql_olap.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged sql-bench/Makefile.am: Auto merged sql-bench/as3ap.sh: Auto merged sql-bench/bench-count-distinct.sh: Auto merged sql-bench/bench-init.pl.sh: Auto merged sql-bench/compare-results.sh: Auto merged sql-bench/copy-db.sh: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/run-all-tests.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql-bench/test-ATIS.sh: Auto merged sql-bench/test-alter-table.sh: Auto merged sql-bench/test-big-tables.sh: Auto merged sql-bench/test-connect.sh: Auto merged sql-bench/test-create.sh: Auto merged sql-bench/test-insert.sh: Auto merged sql-bench/test-select.sh: Auto merged sql-bench/test-transactions.sh: Auto merged sql-bench/test-wisconsin.sh: Auto merged sql-common/my_time.c: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_test.cc: Auto merged sql/sql_update.cc: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/time.cc: Auto merged sql/unireg.cc: Auto merged sql/unireg.h: Auto merged storage/federated/ha_federated.cc: Auto merged storage/heap/Makefile.am: Auto merged storage/heap/_check.c: Auto merged storage/heap/_rectest.c: Auto merged storage/heap/ha_heap.cc: Auto merged storage/heap/ha_heap.h: Auto merged storage/heap/heapdef.h: Auto merged storage/heap/hp_block.c: Auto merged storage/heap/hp_clear.c: Auto merged storage/heap/hp_close.c: Auto merged storage/heap/hp_create.c: Auto merged storage/heap/hp_delete.c: Auto merged storage/heap/hp_extra.c: Auto merged storage/heap/hp_hash.c: Auto merged storage/heap/hp_info.c: Auto merged storage/heap/hp_open.c: Auto merged storage/heap/hp_panic.c: Auto merged storage/heap/hp_rename.c: Auto merged storage/heap/hp_rfirst.c: Auto merged storage/heap/hp_rkey.c: Auto merged storage/heap/hp_rlast.c: Auto merged storage/heap/hp_rnext.c: Auto merged storage/heap/hp_rprev.c: Auto merged storage/heap/hp_rrnd.c: Auto merged storage/heap/hp_rsame.c: Auto merged storage/heap/hp_scan.c: Auto merged storage/heap/hp_static.c: Auto merged storage/heap/hp_test1.c: Auto merged storage/heap/hp_test2.c: Auto merged storage/heap/hp_update.c: Auto merged storage/heap/hp_write.c: Auto merged storage/innobase/Makefile.am: Auto merged storage/innobase/btr/Makefile.am: Auto merged storage/innobase/buf/Makefile.am: Auto merged storage/innobase/data/Makefile.am: Auto merged storage/innobase/dict/Makefile.am: Auto merged storage/innobase/dyn/Makefile.am: Auto merged storage/innobase/eval/Makefile.am: Auto merged storage/innobase/fil/Makefile.am: Auto merged storage/innobase/fsp/Makefile.am: Auto merged storage/innobase/fut/Makefile.am: Auto merged storage/innobase/ha/Makefile.am: Auto merged storage/innobase/ibuf/Makefile.am: Auto merged storage/innobase/lock/Makefile.am: Auto merged storage/innobase/log/Makefile.am: Auto merged storage/innobase/mach/Makefile.am: Auto merged storage/innobase/mem/Makefile.am: Auto merged storage/innobase/mtr/Makefile.am: Auto merged storage/innobase/os/Makefile.am: Auto merged storage/innobase/page/Makefile.am: Auto merged storage/innobase/pars/Makefile.am: Auto merged storage/innobase/que/Makefile.am: Auto merged storage/innobase/read/Makefile.am: Auto merged storage/innobase/rem/Makefile.am: Auto merged storage/innobase/row/Makefile.am: Auto merged storage/innobase/srv/Makefile.am: Auto merged storage/innobase/sync/Makefile.am: Auto merged storage/innobase/thr/Makefile.am: Auto merged storage/innobase/trx/Makefile.am: Auto merged storage/innobase/usr/Makefile.am: Auto merged storage/innobase/ut/Makefile.am: Auto merged storage/myisam/Makefile.am: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ft_eval.c: Auto merged storage/myisam/ft_nlq_search.c: Auto merged storage/myisam/ft_parser.c: Auto merged storage/myisam/ft_static.c: Auto merged storage/myisam/ft_stem.c: Auto merged storage/myisam/ft_stopwords.c: Auto merged storage/myisam/ft_test1.c: Auto merged storage/myisam/ft_test1.h: Auto merged storage/myisam/ft_update.c: Auto merged storage/myisam/ftdefs.h: Auto merged storage/myisam/fulltext.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/ha_myisam.h: Auto merged storage/myisam/mi_cache.c: Auto merged storage/myisam/mi_changed.c: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_checksum.c: Auto merged storage/myisam/mi_close.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_dbug.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/mi_delete_all.c: Auto merged storage/myisam/mi_delete_table.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_extra.c: Auto merged storage/myisam/mi_info.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_locking.c: Auto merged storage/myisam/mi_log.c: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisam/mi_packrec.c: Auto merged storage/myisam/mi_page.c: Auto merged storage/myisam/mi_panic.c: Auto merged storage/myisam/mi_preload.c: Auto merged storage/myisam/mi_range.c: Auto merged storage/myisam/mi_rename.c: Auto merged storage/myisam/mi_rfirst.c: Auto merged storage/myisam/mi_rkey.c: Auto merged storage/myisam/mi_rlast.c: Auto merged storage/myisam/mi_rnext.c: Auto merged storage/myisam/mi_rnext_same.c: Auto merged storage/myisam/mi_rprev.c: Auto merged storage/myisam/mi_rrnd.c: Auto merged storage/myisam/mi_rsame.c: Auto merged storage/myisam/mi_rsamepos.c: Auto merged storage/myisam/mi_scan.c: Auto merged storage/myisam/mi_search.c: Auto merged storage/myisam/mi_static.c: Auto merged storage/myisam/mi_statrec.c: Auto merged storage/myisam/mi_test1.c: Auto merged storage/myisam/mi_test2.c: Auto merged storage/myisam/mi_test3.c: Auto merged storage/myisam/mi_unique.c: Auto merged storage/myisam/mi_update.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisam/myisam_ftdump.c: Auto merged storage/myisam/myisamdef.h: Auto merged storage/myisam/myisamlog.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/rt_index.c: Auto merged storage/myisam/rt_index.h: Auto merged storage/myisam/rt_key.h: Auto merged storage/myisam/rt_mbr.c: Auto merged storage/myisam/rt_mbr.h: Auto merged storage/myisam/rt_split.c: Auto merged storage/myisam/rt_test.c: Auto merged storage/myisam/sort.c: Auto merged storage/myisam/sp_defs.h: Auto merged storage/myisam/sp_test.c: Auto merged storage/myisammrg/Makefile.am: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/myisammrg/ha_myisammrg.h: Auto merged storage/myisammrg/myrg_close.c: Auto merged storage/myisammrg/myrg_create.c: Auto merged storage/myisammrg/myrg_def.h: Auto merged storage/myisammrg/myrg_delete.c: Auto merged storage/myisammrg/myrg_extra.c: Auto merged storage/myisammrg/myrg_info.c: Auto merged storage/myisammrg/myrg_locking.c: Auto merged storage/myisammrg/myrg_open.c: Auto merged storage/myisammrg/myrg_panic.c: Auto merged storage/myisammrg/myrg_queue.c: Auto merged storage/myisammrg/myrg_range.c: Auto merged storage/myisammrg/myrg_rfirst.c: Auto merged storage/myisammrg/myrg_rkey.c: Auto merged storage/myisammrg/myrg_rlast.c: Auto merged storage/myisammrg/myrg_rnext.c: Auto merged storage/myisammrg/myrg_rnext_same.c: Auto merged storage/myisammrg/myrg_rprev.c: Auto merged storage/myisammrg/myrg_rrnd.c: Auto merged storage/myisammrg/myrg_rsame.c: Auto merged storage/myisammrg/myrg_static.c: Auto merged storage/myisammrg/myrg_update.c: Auto merged storage/myisammrg/myrg_write.c: Auto merged storage/ndb/Makefile.am: Auto merged storage/ndb/config/common.mk.am: Auto merged storage/ndb/config/type_kernel.mk.am: Auto merged storage/ndb/config/type_mgmapiclient.mk.am: Auto merged storage/ndb/config/type_ndbapi.mk.am: Auto merged storage/ndb/config/type_ndbapiclient.mk.am: Auto merged storage/ndb/config/type_ndbapitest.mk.am: Auto merged storage/ndb/config/type_ndbapitools.mk.am: Auto merged storage/ndb/config/type_util.mk.am: Auto merged storage/ndb/docs/Makefile.am: Auto merged storage/ndb/include/Makefile.am: Auto merged storage/ndb/include/kernel/kernel_config_parameters.h: Auto merged storage/ndb/include/kernel/signaldata/CntrStart.hpp: Auto merged storage/ndb/include/kernel/signaldata/ReadConfig.hpp: Auto merged storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp: Auto merged storage/ndb/include/logger/FileLogHandler.hpp: Auto merged storage/ndb/include/ndb_net.h: Auto merged storage/ndb/include/mgmapi/mgmapi_config_parameters.h: Auto merged storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h: Auto merged storage/ndb/include/util/ConfigValues.hpp: Auto merged storage/ndb/include/util/File.hpp: Auto merged storage/ndb/include/util/Vector.hpp: Auto merged storage/ndb/src/Makefile.am: Auto merged storage/ndb/src/common/Makefile.am: Auto merged storage/ndb/src/common/debugger/Makefile.am: Auto merged storage/ndb/src/common/debugger/signaldata/CntrStart.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/Makefile.am: Auto merged storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/print.awk: Auto merged storage/ndb/src/common/logger/FileLogHandler.cpp: Auto merged storage/ndb/src/common/logger/Makefile.am: Auto merged storage/ndb/src/common/mgmcommon/Makefile.am: Auto merged storage/ndb/src/common/transporter/Makefile.am: Auto merged storage/ndb/src/common/util/Bitmask.cpp: Auto merged storage/ndb/src/common/util/ConfigValues.cpp: Auto merged storage/ndb/src/common/util/File.cpp: Auto merged storage/ndb/src/common/util/Makefile.am: Auto merged storage/ndb/src/common/util/new.cpp: Auto merged storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp: Auto merged storage/ndb/src/cw/Makefile.am: Auto merged storage/ndb/src/cw/cpcd/Makefile.am: Auto merged storage/ndb/src/kernel/blocks/Makefile.am: Auto merged storage/ndb/src/kernel/blocks/backup/Makefile.am: Auto merged storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl: Auto merged storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/error/Makefile.am: Auto merged storage/ndb/src/kernel/vm/Makefile.am: Auto merged storage/ndb/src/mgmapi/Makefile.am: Auto merged storage/ndb/src/mgmapi/mgmapi_configuration.cpp: Auto merged storage/ndb/src/mgmclient/Makefile.am: Auto merged storage/ndb/src/mgmsrv/Makefile.am: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/ndbapi/Makefile.am: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/ndbapi/Ndbif.cpp: Auto merged storage/ndb/test/Makefile.am: Auto merged storage/ndb/test/ndbapi/Makefile.am: Auto merged storage/ndb/test/ndbapi/bank/Makefile.am: Auto merged storage/ndb/test/ndbapi/testBasic.cpp: Auto merged storage/ndb/test/ndbapi/testIndex.cpp: Auto merged storage/ndb/test/run-test/Makefile.am: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged storage/ndb/test/src/Makefile.am: Auto merged storage/ndb/test/tools/Makefile.am: Auto merged storage/ndb/tools/Makefile.am: Auto merged strings/Makefile.am: Auto merged strings/ctype-extra.c: Auto merged tests/Makefile.am: Auto merged vio/Makefile.am: Auto merged BitKeeper/deleted/.del-colspec-fix.pl~6c78d3332330b19e: Auto merged BitKeeper/deleted/.del-docbook-fixup.pl~46cf3bdef147084e: Auto merged BitKeeper/deleted/.del-docbook-prefix.pl~876c7d33c68c224a: Auto merged BitKeeper/deleted/.del-docbook-split~be931c3922898d0: Auto merged BitKeeper/deleted/.del-make-docbook~ccac1eb717e92ac9: Auto merged BitKeeper/deleted/.del-make-makefile~39fd454b487126e8: Auto merged BitKeeper/deleted/.del-test-make-manual-de~33cad2886311b8a: Auto merged BitKeeper/deleted/.del-test-make-manual~5da458f958a424ec: Auto merged BitKeeper/deleted/.del-xwf~76b97805d9146b80: Auto merged server-tools/instance-manager/listener.h: SCCS merged server-tools/instance-manager/manager.h: SCCS merged server-tools/instance-manager/mysql_connection.h: SCCS merged server-tools/instance-manager/priv.h: SCCS merged storage/ndb/src/kernel/blocks/dblqh/Makefile.am: SCCS merged
364 lines
9.5 KiB
C++
364 lines
9.5 KiB
C++
/* Copyright (C) 2004-2006 MySQL 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; version 2 of the License.
|
|
|
|
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 <m_string.h>
|
|
#include <m_string.h>
|
|
#include <my_global.h>
|
|
#include <mysql.h>
|
|
#include <my_sys.h>
|
|
#include <violite.h>
|
|
|
|
#include "command.h"
|
|
#include "log.h"
|
|
#include "messages.h"
|
|
#include "mysqld_error.h"
|
|
#include "mysql_manager_error.h"
|
|
#include "parse.h"
|
|
#include "priv.h"
|
|
#include "protocol.h"
|
|
#include "thread_registry.h"
|
|
#include "user_map.h"
|
|
|
|
|
|
Mysql_connection::Mysql_connection(Thread_registry *thread_registry_arg,
|
|
User_map *user_map_arg,
|
|
struct st_vio *vio_arg, ulong
|
|
connection_id_arg)
|
|
:vio(vio_arg),
|
|
connection_id(connection_id_arg),
|
|
thread_registry(thread_registry_arg),
|
|
user_map(user_map_arg)
|
|
{
|
|
}
|
|
|
|
|
|
/*
|
|
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().
|
|
*/
|
|
|
|
bool Mysql_connection::init()
|
|
{
|
|
/* Allocate buffers for network I/O */
|
|
if (my_net_init(&net, vio))
|
|
return TRUE;
|
|
|
|
net.return_status= &status;
|
|
|
|
/* Initialize random number generator */
|
|
{
|
|
ulong seed1= (ulong) &rand_st + rand();
|
|
ulong seed2= (ulong) 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;
|
|
|
|
thread_registry->register_thread(&thread_info);
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
void Mysql_connection::cleanup()
|
|
{
|
|
net_end(&net);
|
|
thread_registry->unregister_thread(&thread_info);
|
|
}
|
|
|
|
|
|
Mysql_connection::~Mysql_connection()
|
|
{
|
|
/* vio_delete closes the socket if necessary */
|
|
vio_delete(vio);
|
|
}
|
|
|
|
|
|
void Mysql_connection::main()
|
|
{
|
|
log_info("Connection %lu: accepted.", (unsigned long) connection_id);
|
|
|
|
if (check_connection())
|
|
{
|
|
log_info("Connection %lu: failed to authorize the user.",
|
|
(unsigned long) connection_id);
|
|
|
|
return;
|
|
}
|
|
|
|
log_info("Connection %lu: the user was authorized successfully.",
|
|
(unsigned long) connection_id);
|
|
|
|
vio_keepalive(vio, TRUE);
|
|
|
|
while (!net.error && net.vio && !thread_registry->is_shutdown())
|
|
{
|
|
if (do_command())
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
int Mysql_connection::check_connection()
|
|
{
|
|
ulong pkt_len=0; // to hold client reply length
|
|
|
|
/* 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.str, 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++;
|
|
LEX_STRING user_name= { (char *) user, password - user - 2 };
|
|
|
|
if (password_len != SCRAMBLE_LENGTH)
|
|
{
|
|
net_send_error(&net, ER_ACCESS_DENIED_ERROR);
|
|
return 1;
|
|
}
|
|
if (user_map->authenticate(&user_name, password, scramble))
|
|
{
|
|
net_send_error(&net, ER_ACCESS_DENIED_ERROR);
|
|
return 1;
|
|
}
|
|
net_send_ok(&net, connection_id, NULL);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Mysql_connection::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: received packet (length: %lu; command: %d).",
|
|
(unsigned long) connection_id,
|
|
(unsigned long) packet_length,
|
|
(int) command);
|
|
|
|
return dispatch_command(command, packet + 1);
|
|
}
|
|
}
|
|
|
|
int Mysql_connection::dispatch_command(enum enum_server_command command,
|
|
const char *packet)
|
|
{
|
|
switch (command) {
|
|
case COM_QUIT: // client exit
|
|
log_info("Connection %lu: received QUIT command.",
|
|
(unsigned long) connection_id);
|
|
return 1;
|
|
|
|
case COM_PING:
|
|
log_info("Connection %lu: received PING command.",
|
|
(unsigned long) connection_id);
|
|
net_send_ok(&net, connection_id, NULL);
|
|
return 0;
|
|
|
|
case COM_QUERY:
|
|
{
|
|
log_info("Connection %lu: received QUERY command: '%s'.",
|
|
(unsigned long) connection_id,
|
|
(const char *) packet);
|
|
|
|
if (Command *command= 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;
|
|
|
|
if (!res)
|
|
{
|
|
log_info("Connection %lu: query executed successfully",
|
|
(unsigned long) connection_id);
|
|
}
|
|
else
|
|
{
|
|
log_info("Connection %lu: can not execute query (error: %d).",
|
|
(unsigned long) connection_id,
|
|
(int) res);
|
|
|
|
net_send_error(&net, res);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
log_error("Connection %lu: can not parse query: out ot resources.",
|
|
(unsigned long) connection_id);
|
|
|
|
net_send_error(&net,ER_OUT_OF_RESOURCES);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
default:
|
|
log_info("Connection %lu: received unsupported command (%d).",
|
|
(unsigned long) connection_id,
|
|
(int) command);
|
|
|
|
net_send_error(&net, ER_UNKNOWN_COM_ERROR);
|
|
return 0;
|
|
}
|
|
|
|
return 0; /* Just to make compiler happy. */
|
|
}
|
|
|
|
|
|
void Mysql_connection::run()
|
|
{
|
|
if (init())
|
|
log_error("Connection %lu: can not init handler.",
|
|
(unsigned long) connection_id);
|
|
else
|
|
{
|
|
main();
|
|
cleanup();
|
|
}
|
|
|
|
delete this;
|
|
}
|
|
|
|
/*
|
|
vim: fdm=marker
|
|
*/
|