mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 19:11:46 +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
394 lines
10 KiB
C++
394 lines
10 KiB
C++
/* Copyright (C) 2003-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 */
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
|
|
#include <string.h>
|
|
#include <signal.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
|
|
#ifndef __WIN__
|
|
#include <pwd.h>
|
|
#include <grp.h>
|
|
#include <sys/wait.h>
|
|
#endif
|
|
|
|
#include "log.h"
|
|
#include "manager.h"
|
|
#include "options.h"
|
|
#include "priv.h"
|
|
#include "user_management_commands.h"
|
|
|
|
#ifdef __WIN__
|
|
#include "IMService.h"
|
|
#include "WindowsService.h"
|
|
#endif
|
|
|
|
|
|
/*
|
|
Few notes about Instance Manager architecture:
|
|
Instance Manager consisits of two processes: the angel process, and the
|
|
instance manager process. Responsibilities of the angel process is to
|
|
monitor the instance manager process, and restart it in case of
|
|
failure/shutdown. The angel process is started only if startup option
|
|
'--run-as-service' is provided.
|
|
The Instance Manager process consists of several
|
|
subsystems (thread sets):
|
|
- the signal handling thread: it's responsibilities are to handle
|
|
user signals and propogate them to the other threads. All other threads
|
|
are accounted in the signal handler thread Thread Registry.
|
|
- the listener: listens all sockets. There is a listening
|
|
socket for each (mysql, http, snmp, rendezvous (?)) subsystem.
|
|
- mysql subsystem: Instance Manager acts like an ordinary MySQL Server,
|
|
but with very restricted command set. Each MySQL client connection is
|
|
handled in a separate thread. All MySQL client connections threads
|
|
constitute mysql subsystem.
|
|
- http subsystem: it is also possible to talk with Instance Manager via
|
|
http. One thread per http connection is used. Threads are pooled.
|
|
- 'snmp' connections (FIXME: I know nothing about it yet)
|
|
- rendezvous threads
|
|
*/
|
|
|
|
static void init_environment(char *progname);
|
|
|
|
#ifndef __WIN__
|
|
static void daemonize(const char *log_file_name);
|
|
static void angel();
|
|
static struct passwd *check_user(const char *user);
|
|
static int set_user(const char *user, struct passwd *user_info);
|
|
#endif
|
|
|
|
|
|
/*
|
|
main, entry point
|
|
- init environment
|
|
- handle options
|
|
- daemonize and run angel process (if necessary)
|
|
- run manager process
|
|
*/
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
int return_value= 1;
|
|
init_environment(argv[0]);
|
|
|
|
if ((return_value= Options::load(argc, argv)))
|
|
goto main_end;
|
|
|
|
if (Options::User_management::cmd)
|
|
{
|
|
return_value= Options::User_management::cmd->execute();
|
|
|
|
goto main_end;
|
|
}
|
|
|
|
#ifndef __WIN__
|
|
|
|
struct passwd *user_info;
|
|
|
|
if ((user_info= check_user(Options::Daemon::user)))
|
|
{
|
|
if (set_user(Options::Daemon::user, user_info))
|
|
{
|
|
return_value= 1;
|
|
goto main_end;
|
|
}
|
|
}
|
|
|
|
if (Options::Daemon::run_as_service)
|
|
{
|
|
/* forks, and returns only in child */
|
|
daemonize(Options::Daemon::log_file_name);
|
|
/* forks again, and returns only in child: parent becomes angel */
|
|
angel();
|
|
}
|
|
|
|
(void) Manager::main(); /* ignore the return value for now */
|
|
|
|
#else
|
|
|
|
if (!Options::Service::stand_alone)
|
|
{
|
|
if (HandleServiceOptions())
|
|
{
|
|
return_value= 1;
|
|
goto main_end;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
(void) Manager::main(); /* ignore the return value for now */
|
|
}
|
|
|
|
#endif
|
|
|
|
return_value= 0;
|
|
|
|
main_end:
|
|
Options::cleanup();
|
|
my_end(0);
|
|
return return_value;
|
|
}
|
|
|
|
/******************* Auxilary functions implementation **********************/
|
|
|
|
#if !defined(__WIN__) && !defined(OS2) && !defined(__NETWARE__)
|
|
/* Change to run as another user if started with --user */
|
|
|
|
static struct passwd *check_user(const char *user)
|
|
{
|
|
struct passwd *user_info;
|
|
uid_t user_id= geteuid();
|
|
|
|
/* Don't bother if we aren't superuser */
|
|
if (user_id)
|
|
{
|
|
if (user)
|
|
{
|
|
/* Don't give a warning, if real user is same as given with --user */
|
|
user_info= getpwnam(user);
|
|
if ((!user_info || user_id != user_info->pw_uid))
|
|
log_info("One can only use the --user switch if running as root\n");
|
|
}
|
|
return NULL;
|
|
}
|
|
if (!user)
|
|
{
|
|
log_info("You are running mysqlmanager as root! This might introduce security problems. It is safer to use --user option istead.\n");
|
|
return NULL;
|
|
}
|
|
if (!strcmp(user, "root"))
|
|
return NULL; /* Avoid problem with dynamic libraries */
|
|
if (!(user_info= getpwnam(user)))
|
|
{
|
|
/* Allow a numeric uid to be used */
|
|
const char *pos;
|
|
for (pos= user; my_isdigit(default_charset_info, *pos); pos++)
|
|
{}
|
|
if (*pos) /* Not numeric id */
|
|
goto err;
|
|
if (!(user_info= getpwuid(atoi(user))))
|
|
goto err;
|
|
else
|
|
return user_info;
|
|
}
|
|
else
|
|
return user_info;
|
|
|
|
err:
|
|
log_error("Can not start under user '%s'.",
|
|
(const char *) user);
|
|
return NULL;
|
|
}
|
|
|
|
static int set_user(const char *user, struct passwd *user_info)
|
|
{
|
|
DBUG_ASSERT(user_info);
|
|
#ifdef HAVE_INITGROUPS
|
|
initgroups((char*) user,user_info->pw_gid);
|
|
#endif
|
|
if (setgid(user_info->pw_gid) == -1)
|
|
{
|
|
log_error("setgid() failed");
|
|
return 1;
|
|
}
|
|
if (setuid(user_info->pw_uid) == -1)
|
|
{
|
|
log_error("setuid() failed");
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
|
|
/*
|
|
Init environment, common for daemon and non-daemon
|
|
*/
|
|
|
|
static void init_environment(char *progname)
|
|
{
|
|
MY_INIT(progname);
|
|
log_init();
|
|
umask(0117);
|
|
srand((unsigned int) time(0));
|
|
}
|
|
|
|
|
|
#ifndef __WIN__
|
|
/*
|
|
Become a UNIX service
|
|
SYNOPSIS
|
|
daemonize()
|
|
*/
|
|
|
|
static void daemonize(const char *log_file_name)
|
|
{
|
|
pid_t pid= fork();
|
|
switch (pid) {
|
|
case -1: // parent, fork error
|
|
die("daemonize(): fork failed, %s", strerror(errno));
|
|
case 0: // child, fork ok
|
|
int fd;
|
|
/*
|
|
Become a session leader: setsid must succeed because child is
|
|
guaranteed not to be a process group leader (it belongs to the
|
|
process group of the parent.)
|
|
The goal is not to have a controlling terminal.
|
|
*/
|
|
setsid();
|
|
/*
|
|
As we now don't have a controlling terminal we will not receive
|
|
tty-related signals - no need to ignore them.
|
|
*/
|
|
|
|
close(STDIN_FILENO);
|
|
|
|
fd= open(log_file_name, O_WRONLY | O_CREAT | O_APPEND | O_NOCTTY,
|
|
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
|
|
if (fd < 0)
|
|
die("daemonize(): failed to open log file %s, %s", log_file_name,
|
|
strerror(errno));
|
|
dup2(fd, STDOUT_FILENO);
|
|
dup2(fd, STDERR_FILENO);
|
|
if (fd != STDOUT_FILENO && fd != STDERR_FILENO)
|
|
close(fd);
|
|
|
|
/* TODO: chroot() and/or chdir() here */
|
|
break;
|
|
default:
|
|
/* successfully exit from parent */
|
|
exit(0);
|
|
}
|
|
}
|
|
|
|
|
|
enum { CHILD_OK= 0, CHILD_NEED_RESPAWN, CHILD_EXIT_ANGEL };
|
|
|
|
static volatile sig_atomic_t child_status= CHILD_OK;
|
|
|
|
/*
|
|
Signal handler for SIGCHLD: reap child, analyze child exit status, and set
|
|
child_status appropriately.
|
|
*/
|
|
|
|
void reap_child(int __attribute__((unused)) signo)
|
|
{
|
|
int child_exit_status;
|
|
/* As we have only one child, no need to cycle waitpid */
|
|
if (waitpid(0, &child_exit_status, WNOHANG) > 0)
|
|
{
|
|
if (WIFSIGNALED(child_exit_status))
|
|
child_status= CHILD_NEED_RESPAWN;
|
|
else
|
|
/*
|
|
As reap_child is not called for SIGSTOP, we should be here only
|
|
if the child exited normally.
|
|
*/
|
|
child_status= CHILD_EXIT_ANGEL;
|
|
}
|
|
}
|
|
|
|
static volatile sig_atomic_t is_terminated= 0;
|
|
|
|
/*
|
|
Signal handler for terminate signals - SIGTERM, SIGHUP, SIGINT.
|
|
Set termination status and return.
|
|
(q) do we need to handle SIGQUIT?
|
|
*/
|
|
|
|
void terminate(int signo)
|
|
{
|
|
is_terminated= signo;
|
|
}
|
|
|
|
|
|
/*
|
|
Fork a child and monitor it.
|
|
User can explicitly kill the angel process with SIGTERM/SIGHUP/SIGINT.
|
|
Angel process will exit silently if mysqlmanager exits normally.
|
|
*/
|
|
|
|
static void angel()
|
|
{
|
|
/* install signal handlers */
|
|
sigset_t zeromask; // to sigsuspend in parent
|
|
struct sigaction sa_chld, sa_term;
|
|
struct sigaction sa_chld_out, sa_term_out, sa_int_out, sa_hup_out;
|
|
|
|
sigemptyset(&zeromask);
|
|
sigemptyset(&sa_chld.sa_mask);
|
|
sigemptyset(&sa_term.sa_mask);
|
|
|
|
sa_chld.sa_handler= reap_child;
|
|
sa_chld.sa_flags= SA_NOCLDSTOP;
|
|
sa_term.sa_handler= terminate;
|
|
sa_term.sa_flags= 0;
|
|
|
|
/* sigaction can fail only on wrong arguments */
|
|
sigaction(SIGCHLD, &sa_chld, &sa_chld_out);
|
|
sigaction(SIGTERM, &sa_term, &sa_term_out);
|
|
sigaction(SIGINT, &sa_term, &sa_int_out);
|
|
sigaction(SIGHUP, &sa_term, &sa_hup_out);
|
|
|
|
/* spawn a child */
|
|
spawn:
|
|
pid_t pid= fork();
|
|
switch (pid) {
|
|
case -1:
|
|
die("angel(): fork failed, %s", strerror(errno));
|
|
case 0: // child, success
|
|
/*
|
|
restore default actions for signals to let the manager work with
|
|
signals as he wishes
|
|
*/
|
|
sigaction(SIGCHLD, &sa_chld_out, 0);
|
|
sigaction(SIGTERM, &sa_term_out, 0);
|
|
sigaction(SIGINT, &sa_int_out, 0);
|
|
sigaction(SIGHUP, &sa_hup_out, 0);
|
|
/* Here we return to main, and fall into manager */
|
|
break;
|
|
default: // parent, success
|
|
pid= getpid(); /* Get our pid. */
|
|
|
|
log_info("Angel pid file: '%s'; PID: %d.",
|
|
(const char *) Options::Daemon::angel_pid_file_name,
|
|
(int) pid);
|
|
|
|
create_pid_file(Options::Daemon::angel_pid_file_name, pid);
|
|
|
|
while (child_status == CHILD_OK && is_terminated == 0)
|
|
sigsuspend(&zeromask);
|
|
|
|
if (is_terminated)
|
|
log_info("angel got signal %d, exiting", is_terminated);
|
|
else if (child_status == CHILD_NEED_RESPAWN)
|
|
{
|
|
child_status= CHILD_OK;
|
|
log_error("angel(): mysqlmanager exited abnormally: respawning...");
|
|
sleep(1); /* don't respawn too fast */
|
|
goto spawn;
|
|
}
|
|
/*
|
|
mysqlmanager successfully exited, let's silently evaporate
|
|
If we return to main we will fall into the manager functionality,
|
|
so let's simply exit().
|
|
*/
|
|
exit(0);
|
|
}
|
|
}
|
|
#endif
|