mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +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
556 lines
16 KiB
C++
556 lines
16 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 */
|
|
|
|
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
|
|
#pragma implementation
|
|
#endif
|
|
|
|
#include "options.h"
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include <my_getopt.h>
|
|
#include <mysql_com.h>
|
|
|
|
#include "exit_codes.h"
|
|
#include "log.h"
|
|
#include "portability.h"
|
|
#include "priv.h"
|
|
#include "user_management_commands.h"
|
|
|
|
#define QUOTE2(x) #x
|
|
#define QUOTE(x) QUOTE2(x)
|
|
|
|
#ifdef __WIN__
|
|
|
|
/* Define holders for default values. */
|
|
|
|
static char win_dflt_config_file_name[FN_REFLEN];
|
|
static char win_dflt_password_file_name[FN_REFLEN];
|
|
static char win_dflt_pid_file_name[FN_REFLEN];
|
|
|
|
static char win_dflt_mysqld_path[FN_REFLEN];
|
|
|
|
/* Define and initialize Windows-specific options. */
|
|
|
|
my_bool Options::Service::install_as_service;
|
|
my_bool Options::Service::remove_service;
|
|
my_bool Options::Service::stand_alone;
|
|
|
|
const char *Options::Main::config_file= win_dflt_config_file_name;
|
|
const char *Options::Main::password_file_name= win_dflt_password_file_name;
|
|
const char *Options::Main::pid_file_name= win_dflt_pid_file_name;
|
|
|
|
const char *Options::Main::default_mysqld_path= win_dflt_mysqld_path;
|
|
|
|
static int setup_windows_defaults();
|
|
|
|
#else /* UNIX */
|
|
|
|
/* Define and initialize UNIX-specific options. */
|
|
|
|
my_bool Options::Daemon::run_as_service= FALSE;
|
|
const char *Options::Daemon::log_file_name= QUOTE(DEFAULT_LOG_FILE_NAME);
|
|
const char *Options::Daemon::user= NULL; /* No default value */
|
|
const char *Options::Daemon::angel_pid_file_name= NULL;
|
|
|
|
const char *Options::Main::config_file= QUOTE(DEFAULT_CONFIG_FILE);
|
|
const char *
|
|
Options::Main::password_file_name= QUOTE(DEFAULT_PASSWORD_FILE_NAME);
|
|
const char *Options::Main::pid_file_name= QUOTE(DEFAULT_PID_FILE_NAME);
|
|
const char *Options::Main::socket_file_name= QUOTE(DEFAULT_SOCKET_FILE_NAME);
|
|
|
|
const char *Options::Main::default_mysqld_path= QUOTE(DEFAULT_MYSQLD_PATH);
|
|
|
|
#endif
|
|
|
|
/* Remember if the config file was forced. */
|
|
|
|
bool Options::Main::is_forced_default_file= FALSE;
|
|
|
|
/* Define and initialize common options. */
|
|
|
|
const char *Options::Main::bind_address= NULL; /* No default value */
|
|
uint Options::Main::monitoring_interval= DEFAULT_MONITORING_INTERVAL;
|
|
uint Options::Main::port_number= DEFAULT_PORT;
|
|
my_bool Options::Main::mysqld_safe_compatible= FALSE;
|
|
|
|
/* Options::User_management */
|
|
|
|
char *Options::User_management::user_name= NULL;
|
|
char *Options::User_management::password= NULL;
|
|
|
|
User_management_cmd *Options::User_management::cmd= NULL;
|
|
|
|
/* Private members. */
|
|
|
|
char **Options::saved_argv= NULL;
|
|
|
|
#ifndef DBUG_OFF
|
|
const char *Options::Debug::config_str= "d:t:i:O,im.trace";
|
|
#endif
|
|
|
|
static const char * const ANGEL_PID_FILE_SUFFIX= ".angel.pid";
|
|
static const int ANGEL_PID_FILE_SUFFIX_LEN= strlen(ANGEL_PID_FILE_SUFFIX);
|
|
|
|
/*
|
|
List of options, accepted by the instance manager.
|
|
List must be closed with empty option.
|
|
*/
|
|
|
|
enum options {
|
|
OPT_USERNAME= 'u',
|
|
OPT_PASSWORD= 'p',
|
|
OPT_LOG= 256,
|
|
OPT_PID_FILE,
|
|
OPT_SOCKET,
|
|
OPT_PASSWORD_FILE,
|
|
OPT_MYSQLD_PATH,
|
|
#ifdef __WIN__
|
|
OPT_INSTALL_SERVICE,
|
|
OPT_REMOVE_SERVICE,
|
|
OPT_STAND_ALONE,
|
|
#else
|
|
OPT_RUN_AS_SERVICE,
|
|
OPT_USER,
|
|
OPT_ANGEL_PID_FILE,
|
|
#endif
|
|
OPT_MONITORING_INTERVAL,
|
|
OPT_PORT,
|
|
OPT_WAIT_TIMEOUT,
|
|
OPT_BIND_ADDRESS,
|
|
OPT_PRINT_PASSWORD_LINE,
|
|
OPT_ADD_USER,
|
|
OPT_DROP_USER,
|
|
OPT_EDIT_USER,
|
|
OPT_CLEAN_PASSWORD_FILE,
|
|
OPT_CHECK_PASSWORD_FILE,
|
|
OPT_LIST_USERS,
|
|
OPT_MYSQLD_SAFE_COMPATIBLE
|
|
};
|
|
|
|
static struct my_option my_long_options[] =
|
|
{
|
|
{ "help", '?', "Display this help and exit.",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "add-user", OPT_ADD_USER,
|
|
"Add a user to the password file",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
#ifndef __WIN__
|
|
{ "angel-pid-file", OPT_ANGEL_PID_FILE, "Pid file for angel process.",
|
|
(gptr *) &Options::Daemon::angel_pid_file_name,
|
|
(gptr *) &Options::Daemon::angel_pid_file_name,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
#endif
|
|
|
|
{ "bind-address", OPT_BIND_ADDRESS, "Bind address to use for connection.",
|
|
(gptr *) &Options::Main::bind_address,
|
|
(gptr *) &Options::Main::bind_address,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "check-password-file", OPT_CHECK_PASSWORD_FILE,
|
|
"Check the password file for consistency",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "clean-password-file", OPT_CLEAN_PASSWORD_FILE,
|
|
"Clean the password file",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
#ifndef DBUG_OFF
|
|
{"debug", '#', "Debug log.",
|
|
(gptr *) &Options::Debug::config_str,
|
|
(gptr *) &Options::Debug::config_str,
|
|
0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
|
|
#endif
|
|
|
|
{ "default-mysqld-path", OPT_MYSQLD_PATH, "Where to look for MySQL"
|
|
" Server binary.",
|
|
(gptr *) &Options::Main::default_mysqld_path,
|
|
(gptr *) &Options::Main::default_mysqld_path,
|
|
0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "drop-user", OPT_DROP_USER,
|
|
"Drop existing user from the password file",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "edit-user", OPT_EDIT_USER,
|
|
"Edit existing user in the password file",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
#ifdef __WIN__
|
|
{ "install", OPT_INSTALL_SERVICE, "Install as system service.",
|
|
(gptr *) &Options::Service::install_as_service,
|
|
(gptr *) &Options::Service::install_as_service,
|
|
0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
|
|
#endif
|
|
|
|
{ "list-users", OPT_LIST_USERS,
|
|
"Print out a list of registered users",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
#ifndef __WIN__
|
|
{ "log", OPT_LOG, "Path to log file. Used only with --run-as-service.",
|
|
(gptr *) &Options::Daemon::log_file_name,
|
|
(gptr *) &Options::Daemon::log_file_name,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
#endif
|
|
|
|
{ "monitoring-interval", OPT_MONITORING_INTERVAL, "Interval to monitor"
|
|
" instances in seconds.",
|
|
(gptr *) &Options::Main::monitoring_interval,
|
|
(gptr *) &Options::Main::monitoring_interval,
|
|
0, GET_UINT, REQUIRED_ARG, DEFAULT_MONITORING_INTERVAL,
|
|
0, 0, 0, 0, 0 },
|
|
|
|
{ "mysqld-safe-compatible", OPT_MYSQLD_SAFE_COMPATIBLE,
|
|
"Start Instance Manager in mysqld_safe compatible manner",
|
|
(gptr *) &Options::Main::mysqld_safe_compatible,
|
|
(gptr *) &Options::Main::mysqld_safe_compatible,
|
|
0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
|
|
|
|
{ "print-password-line", OPT_PRINT_PASSWORD_LINE,
|
|
"Print out a user entry as a line for the password file and exit.",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "password", OPT_PASSWORD, "Password to update the password file",
|
|
(gptr *) &Options::User_management::password,
|
|
(gptr *) &Options::User_management::password,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "password-file", OPT_PASSWORD_FILE,
|
|
"Look for Instance Manager users and passwords here.",
|
|
(gptr *) &Options::Main::password_file_name,
|
|
(gptr *) &Options::Main::password_file_name,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "pid-file", OPT_PID_FILE, "Pid file to use.",
|
|
(gptr *) &Options::Main::pid_file_name,
|
|
(gptr *) &Options::Main::pid_file_name,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "port", OPT_PORT, "Port number to use for connections",
|
|
(gptr *) &Options::Main::port_number,
|
|
(gptr *) &Options::Main::port_number,
|
|
0, GET_UINT, REQUIRED_ARG, DEFAULT_PORT, 0, 0, 0, 0, 0 },
|
|
|
|
#ifdef __WIN__
|
|
{ "remove", OPT_REMOVE_SERVICE, "Remove system service.",
|
|
(gptr *) &Options::Service::remove_service,
|
|
(gptr *) &Options::Service::remove_service,
|
|
0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0},
|
|
#else
|
|
{ "run-as-service", OPT_RUN_AS_SERVICE,
|
|
"Daemonize and start angel process.",
|
|
(gptr *) &Options::Daemon::run_as_service,
|
|
0, 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
|
|
#endif
|
|
|
|
#ifndef __WIN__
|
|
{ "socket", OPT_SOCKET, "Socket file to use for connection.",
|
|
(gptr *) &Options::Main::socket_file_name,
|
|
(gptr *) &Options::Main::socket_file_name,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
#endif
|
|
|
|
#ifdef __WIN__
|
|
{ "standalone", OPT_STAND_ALONE, "Run the application in stand alone mode.",
|
|
(gptr *) &Options::Service::stand_alone,
|
|
(gptr *) &Options::Service::stand_alone,
|
|
0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0},
|
|
#else
|
|
{ "user", OPT_USER, "Username to start mysqlmanager",
|
|
(gptr *) &Options::Daemon::user,
|
|
(gptr *) &Options::Daemon::user,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
#endif
|
|
|
|
{ "username", OPT_USERNAME,
|
|
"Username to update the password file",
|
|
(gptr *) &Options::User_management::user_name,
|
|
(gptr *) &Options::User_management::user_name,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "version", 'V', "Output version information and exit.", 0, 0, 0,
|
|
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "wait-timeout", OPT_WAIT_TIMEOUT, "The number of seconds IM waits "
|
|
"for activity on a connection before closing it.",
|
|
(gptr *) &net_read_timeout,
|
|
(gptr *) &net_read_timeout,
|
|
0, GET_ULONG, REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0 },
|
|
|
|
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }
|
|
};
|
|
|
|
static void version()
|
|
{
|
|
printf("%s Ver %s for %s on %s\n", my_progname,
|
|
(const char *) mysqlmanager_version.str,
|
|
SYSTEM_TYPE, MACHINE_TYPE);
|
|
}
|
|
|
|
|
|
static const char *default_groups[]= { "manager", 0 };
|
|
|
|
|
|
static void usage()
|
|
{
|
|
version();
|
|
|
|
printf("Copyright (C) 2003, 2004 MySQL AB\n"
|
|
"This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
|
|
"and you are welcome to modify and redistribute it under the GPL license\n");
|
|
printf("Usage: %s [OPTIONS] \n", my_progname);
|
|
|
|
my_print_help(my_long_options);
|
|
printf("\nThe following options may be given as the first argument:\n"
|
|
"--print-defaults Print the program argument list and exit\n"
|
|
"--defaults-file=# Only read manager configuration and instance\n"
|
|
" setings from the given file #. The same file\n"
|
|
" will be used to modify configuration of instances\n"
|
|
" with SET commands.\n");
|
|
my_print_variables(my_long_options);
|
|
}
|
|
|
|
|
|
C_MODE_START
|
|
|
|
static my_bool
|
|
get_one_option(int optid,
|
|
const struct my_option *opt __attribute__((unused)),
|
|
char *argument)
|
|
{
|
|
switch(optid) {
|
|
case 'V':
|
|
version();
|
|
exit(0);
|
|
case OPT_PRINT_PASSWORD_LINE:
|
|
case OPT_ADD_USER:
|
|
case OPT_DROP_USER:
|
|
case OPT_EDIT_USER:
|
|
case OPT_CLEAN_PASSWORD_FILE:
|
|
case OPT_CHECK_PASSWORD_FILE:
|
|
case OPT_LIST_USERS:
|
|
if (Options::User_management::cmd)
|
|
{
|
|
fprintf(stderr, "Error: only one password-management command "
|
|
"can be specified at a time.\n");
|
|
exit(ERR_INVALID_USAGE);
|
|
}
|
|
|
|
switch (optid) {
|
|
case OPT_PRINT_PASSWORD_LINE:
|
|
Options::User_management::cmd= new Print_password_line_cmd();
|
|
break;
|
|
case OPT_ADD_USER:
|
|
Options::User_management::cmd= new Add_user_cmd();
|
|
break;
|
|
case OPT_DROP_USER:
|
|
Options::User_management::cmd= new Drop_user_cmd();
|
|
break;
|
|
case OPT_EDIT_USER:
|
|
Options::User_management::cmd= new Edit_user_cmd();
|
|
break;
|
|
case OPT_CLEAN_PASSWORD_FILE:
|
|
Options::User_management::cmd= new Clean_db_cmd();
|
|
break;
|
|
case OPT_CHECK_PASSWORD_FILE:
|
|
Options::User_management::cmd= new Check_db_cmd();
|
|
break;
|
|
case OPT_LIST_USERS:
|
|
Options::User_management::cmd= new List_users_cmd();
|
|
break;
|
|
}
|
|
|
|
break;
|
|
case '?':
|
|
usage();
|
|
exit(0);
|
|
case '#':
|
|
#ifndef DBUG_OFF
|
|
DBUG_SET(argument ? argument : Options::Debug::config_str);
|
|
DBUG_SET_INITIAL(argument ? argument : Options::Debug::config_str);
|
|
#endif
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
C_MODE_END
|
|
|
|
|
|
/*
|
|
- Process argv of original program: get tid of --defaults-extra-file
|
|
and print a message if met there.
|
|
- call load_defaults to load configuration file section and save the pointer
|
|
for free_defaults.
|
|
- call handle_options to assign defaults and command-line arguments
|
|
to the class members.
|
|
if either of these function fail, return the error code.
|
|
*/
|
|
|
|
int Options::load(int argc, char **argv)
|
|
{
|
|
if (argc >= 2)
|
|
{
|
|
if (is_prefix(argv[1], "--defaults-file="))
|
|
{
|
|
Main::config_file= strchr(argv[1], '=') + 1;
|
|
Main::is_forced_default_file= TRUE;
|
|
}
|
|
if (is_prefix(argv[1], "--defaults-extra-file=") ||
|
|
is_prefix(argv[1], "--no-defaults"))
|
|
{
|
|
/* the log is not enabled yet */
|
|
fprintf(stderr, "The --defaults-extra-file and --no-defaults options"
|
|
" are not supported by\n"
|
|
"Instance Manager. Program aborted.\n");
|
|
return ERR_INVALID_USAGE;
|
|
}
|
|
}
|
|
|
|
#ifdef __WIN__
|
|
if (setup_windows_defaults())
|
|
{
|
|
fprintf(stderr, "Internal error: could not setup default values.\n");
|
|
return ERR_OUT_OF_MEMORY;
|
|
}
|
|
#endif
|
|
|
|
/* load_defaults will reset saved_argv with a new allocated list */
|
|
saved_argv= argv;
|
|
|
|
/* config-file options are prepended to command-line ones */
|
|
|
|
log_info("Loading config file '%s'...",
|
|
(const char *) Main::config_file);
|
|
|
|
load_defaults(Main::config_file, default_groups, &argc, &saved_argv);
|
|
|
|
if ((handle_options(&argc, &saved_argv, my_long_options, get_one_option)))
|
|
return ERR_INVALID_USAGE;
|
|
|
|
if (!User_management::cmd &&
|
|
(User_management::user_name || User_management::password))
|
|
{
|
|
fprintf(stderr,
|
|
"--username and/or --password options have been specified, "
|
|
"but no password-management command has been given.\n");
|
|
return ERR_INVALID_USAGE;
|
|
}
|
|
|
|
#ifndef __WIN__
|
|
if (Options::Daemon::run_as_service)
|
|
{
|
|
if (Options::Daemon::angel_pid_file_name == NULL)
|
|
{
|
|
/*
|
|
Calculate angel pid file on the IM pid file basis: replace the
|
|
extension (everything after the last dot) of the pid file basename to
|
|
'.angel.pid'.
|
|
*/
|
|
|
|
char *angel_pid_file_name;
|
|
char *base_name_ptr;
|
|
char *ext_ptr;
|
|
|
|
angel_pid_file_name=
|
|
(char *) malloc(strlen(Options::Main::pid_file_name) +
|
|
ANGEL_PID_FILE_SUFFIX_LEN);
|
|
|
|
strcpy(angel_pid_file_name, Options::Main::pid_file_name);
|
|
|
|
base_name_ptr= strrchr(angel_pid_file_name, '/');
|
|
|
|
if (!base_name_ptr)
|
|
base_name_ptr= angel_pid_file_name + 1;
|
|
|
|
ext_ptr= strrchr(base_name_ptr, '.');
|
|
if (ext_ptr)
|
|
*ext_ptr= 0;
|
|
|
|
strcat(angel_pid_file_name, ANGEL_PID_FILE_SUFFIX);
|
|
|
|
Options::Daemon::angel_pid_file_name= angel_pid_file_name;
|
|
}
|
|
else
|
|
{
|
|
Options::Daemon::angel_pid_file_name=
|
|
strdup(Options::Daemon::angel_pid_file_name);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
|
|
void Options::cleanup()
|
|
{
|
|
if (saved_argv)
|
|
free_defaults(saved_argv);
|
|
|
|
delete User_management::cmd;
|
|
|
|
#ifndef __WIN__
|
|
if (Options::Daemon::run_as_service)
|
|
free((void *) Options::Daemon::angel_pid_file_name);
|
|
#endif
|
|
}
|
|
|
|
#ifdef __WIN__
|
|
|
|
static int setup_windows_defaults()
|
|
{
|
|
char module_full_name[FN_REFLEN];
|
|
char dir_name[FN_REFLEN];
|
|
char base_name[FN_REFLEN];
|
|
char im_name[FN_REFLEN];
|
|
char *base_name_ptr;
|
|
char *ptr;
|
|
|
|
/* Determine dirname and basename. */
|
|
|
|
if (!GetModuleFileName(NULL, module_full_name, sizeof (module_full_name)) ||
|
|
!GetFullPathName(module_full_name, sizeof (dir_name), dir_name,
|
|
&base_name_ptr))
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
strmake(base_name, base_name_ptr, FN_REFLEN);
|
|
*base_name_ptr= 0;
|
|
|
|
strmake(im_name, base_name, FN_REFLEN);
|
|
ptr= strrchr(im_name, '.');
|
|
|
|
if (!ptr)
|
|
return 1;
|
|
|
|
*ptr= 0;
|
|
|
|
/* Initialize the defaults. */
|
|
|
|
strxmov(win_dflt_config_file_name, dir_name, DFLT_CONFIG_FILE_NAME, NullS);
|
|
strxmov(win_dflt_mysqld_path, dir_name, DFLT_MYSQLD_PATH, NullS);
|
|
strxmov(win_dflt_password_file_name, dir_name, im_name, DFLT_PASSWD_FILE_EXT,
|
|
NullS);
|
|
strxmov(win_dflt_pid_file_name, dir_name, im_name, DFLT_PID_FILE_EXT, NullS);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#endif
|