mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 06:22:28 +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
405 lines
9.4 KiB
Bash
405 lines
9.4 KiB
Bash
#!/bin/sh
|
|
# Copyright (C) 2004 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
# This scripts starts the table handler ndbcluster
|
|
|
|
# configurable parameters, make sure to change in mysqlcluterd as well
|
|
port=@ndb_port@
|
|
fsdir=`pwd`
|
|
# end configurable parameters
|
|
|
|
#BASEDIR is always one above mysql-test directory
|
|
CWD=`pwd`
|
|
cd ..
|
|
BASEDIR=`pwd`
|
|
cd $CWD
|
|
|
|
# Are we using a source or a binary distribution?
|
|
if [ -d ../sql ] ; then
|
|
SOURCE_DIST=1
|
|
ndbtop=$BASEDIR/storage/ndb
|
|
exec_ndb=$ndbtop/src/kernel/ndbd
|
|
exec_mgmtsrvr=$ndbtop/src/mgmsrv/ndb_mgmd
|
|
exec_waiter=$ndbtop/tools/ndb_waiter
|
|
exec_test=$ndbtop/tools/ndb_test_platform
|
|
exec_mgmtclient=$ndbtop/src/mgmclient/ndb_mgm
|
|
else
|
|
BINARY_DIST=1
|
|
if test -x "$BASEDIR/libexec/ndbd"
|
|
then
|
|
exec_ndb=$BASEDIR/libexec/ndbd
|
|
exec_mgmtsrvr=$BASEDIR/libexec/ndb_mgmd
|
|
else
|
|
exec_ndb=$BASEDIR/bin/ndbd
|
|
exec_mgmtsrvr=$BASEDIR/bin/ndb_mgmd
|
|
fi
|
|
exec_waiter=$BASEDIR/bin/ndb_waiter
|
|
exec_test=$BASEDIR/bin/ndb_test_platform
|
|
exec_mgmtclient=$BASEDIR/bin/ndb_mgm
|
|
fi
|
|
|
|
if $exec_test ; then :; else
|
|
echo "ndb not correctly compiled to support this platform"
|
|
exit 1
|
|
fi
|
|
|
|
pidfile=ndbcluster.pid
|
|
cfgfile=Ndb.cfg
|
|
test_ndb=
|
|
stop_ndb=
|
|
initial_ndb=
|
|
status_ndb=
|
|
ndb_diskless=0
|
|
ndbd_nodes=2
|
|
relative_config_data_dir=
|
|
opt_core=
|
|
|
|
ndb_no_ord=512
|
|
ndb_no_attr=2048
|
|
ndb_con_op=105000
|
|
ndb_dmem=80M
|
|
ndb_imem=24M
|
|
ndb_pbmem=32M
|
|
|
|
VERBOSE=100
|
|
NDB_MGM_EXTRA_OPTS=
|
|
NDB_MGMD_EXTRA_OPTS=
|
|
NDBD_EXTRA_OPTS=
|
|
CHARSETSDIR=
|
|
|
|
while test $# -gt 0; do
|
|
case "$1" in
|
|
--test)
|
|
test_ndb=1
|
|
;;
|
|
--stop)
|
|
stop_ndb=1
|
|
;;
|
|
--initial)
|
|
flags_ndb="$flags_ndb --initial"
|
|
initial_ndb=1
|
|
;;
|
|
--debug*)
|
|
flags_ndb="$flags_ndb $1"
|
|
;;
|
|
--ndbd-nodes=*)
|
|
ndbd_nodes=`echo "$1" | sed -e "s;--ndbd-nodes=;;"`
|
|
;;
|
|
--status)
|
|
status_ndb=1
|
|
;;
|
|
--small)
|
|
ndb_no_ord=32
|
|
ndb_con_op=5000
|
|
ndb_dmem=20M
|
|
ndb_imem=1M
|
|
ndb_pbmem=4M
|
|
;;
|
|
--diskless)
|
|
ndb_diskless=1
|
|
;;
|
|
--data-dir=*)
|
|
fsdir=`echo "$1" | sed -e "s;--data-dir=;;"`
|
|
;;
|
|
--relative-config-data-dir)
|
|
relative_config_data_dir=1
|
|
;;
|
|
--port=*)
|
|
port=`echo "$1" | sed -e "s;--port=;;"`
|
|
;;
|
|
--port-base=*)
|
|
$ECHO "--port-base option depricated. Ignored."
|
|
;;
|
|
--ndb_mgm-extra-opts=*)
|
|
NDB_MGM_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndb_mgm-extra-opts=;;"`
|
|
;;
|
|
--ndb_mgmd-extra-opts=*)
|
|
NDB_MGMD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndb_mgmd-extra-opts=;;"`
|
|
;;
|
|
--ndbd-extra-opts=*)
|
|
NDBD_EXTRA_OPTS=`echo "$1" | sed -e "s;--ndbd-extra-opts=;;"`
|
|
;;
|
|
--character-sets-dir=*)
|
|
CHARSETSDIR=`echo "$1" | sed -e "s;--character-sets-dir=;;"`
|
|
;;
|
|
--core)
|
|
opt_core="--core"
|
|
;;
|
|
--verbose=*)
|
|
VERBOSE=`echo "$1" | sed -e "s;--verbose=;;"`
|
|
;;
|
|
-- ) shift; break ;;
|
|
--* ) $ECHO "Unrecognized option: $1"; exit 1 ;;
|
|
* ) break ;;
|
|
esac
|
|
shift
|
|
done
|
|
|
|
fs_ndb="$fsdir/ndbcluster-$port"
|
|
config_ini=ndb/ndb_config_${ndbd_nodes}_node.ini
|
|
|
|
NDB_HOME=
|
|
if [ ! -d "$fsdir" ]; then
|
|
echo "$fsdir missing"
|
|
exit 1
|
|
fi
|
|
if [ ! -x "$exec_ndb" ]; then
|
|
echo "$exec_ndb missing"
|
|
exit 1
|
|
fi
|
|
if [ ! -x "$exec_mgmtsrvr" ]; then
|
|
echo "$exec_mgmtsrvr missing"
|
|
exit 1
|
|
fi
|
|
if [ ! -x "$exec_waiter" ]; then
|
|
echo "$exec_waiter missing"
|
|
exit 1
|
|
fi
|
|
if [ ! -f "$config_ini" ]; then
|
|
echo "$config_ini missing, unsupported number of nodes"
|
|
exit 1
|
|
fi
|
|
|
|
exec_mgmtclient="$exec_mgmtclient --no-defaults $opt_core $NDB_MGM_EXTRA_OPTS"
|
|
exec_mgmtsrvr="$exec_mgmtsrvr --no-defaults $opt_core $NDB_MGMD_EXTRA_OPTS"
|
|
exec_ndb="$exec_ndb --no-defaults $opt_core $NDBD_EXTRA_OPTS --character-sets-dir=$CHARSETSDIR"
|
|
exec_waiter="$exec_waiter --no-defaults $opt_core"
|
|
|
|
ndb_host="localhost"
|
|
ndb_mgmd_port=$port
|
|
NDB_CONNECTSTRING="host=$ndb_host:$ndb_mgmd_port"
|
|
export NDB_CONNECTSTRING
|
|
|
|
sleep_until_file_created () {
|
|
file=$1
|
|
loop=$2
|
|
org_time=$2
|
|
message=$3
|
|
while (test $loop -gt 0)
|
|
do
|
|
if [ -r $file ]
|
|
then
|
|
return 0
|
|
fi
|
|
sleep 1
|
|
loop=`expr $loop - 1`
|
|
done
|
|
if [ $message ]
|
|
then
|
|
echo $message
|
|
fi
|
|
echo "ERROR: $file was not created in $org_time seconds; Aborting"
|
|
return 1;
|
|
}
|
|
|
|
start_default_ndbcluster() {
|
|
|
|
# do some checks
|
|
|
|
if [ "$initial_ndb" ] ; then
|
|
[ -d "$fs_ndb" ] || mkdir "$fs_ndb"
|
|
fi
|
|
if [ -d "$fs_ndb" ]; then :; else
|
|
echo "$fs_ndb filesystem directory does not exist"
|
|
exit 1
|
|
fi
|
|
|
|
# Start management server as deamon
|
|
|
|
# Edit file system path and ports in config file
|
|
if [ $relative_config_data_dir ] ; then
|
|
config_fs_ndb="."
|
|
else
|
|
config_fs_ndb=$fs_ndb
|
|
fi
|
|
if [ $initial_ndb ] ; then
|
|
rm -rf $fs_ndb/ndb_* 2>&1 | cat > /dev/null
|
|
sed \
|
|
-e s,"CHOOSE_MaxNoOfAttributes","$ndb_no_attr",g \
|
|
-e s,"CHOOSE_MaxNoOfOrderedIndexes","$ndb_no_ord",g \
|
|
-e s,"CHOOSE_MaxNoOfConcurrentOperations","$ndb_con_op",g \
|
|
-e s,"CHOOSE_DataMemory","$ndb_dmem",g \
|
|
-e s,"CHOOSE_IndexMemory","$ndb_imem",g \
|
|
-e s,"CHOOSE_Diskless","$ndb_diskless",g \
|
|
-e s,"CHOOSE_HOSTNAME_".*,"$ndb_host",g \
|
|
-e s,"CHOOSE_FILESYSTEM","$config_fs_ndb",g \
|
|
-e s,"CHOOSE_PORT_MGM","$ndb_mgmd_port",g \
|
|
-e s,"CHOOSE_DiskPageBufferMemory","$ndb_pbmem",g \
|
|
< "$config_ini" \
|
|
> "$fs_ndb/config.ini"
|
|
fi
|
|
|
|
rm -f "$cfgfile" 2>&1 | cat > /dev/null
|
|
rm -f "$fs_ndb/$cfgfile" 2>&1 | cat > /dev/null
|
|
|
|
if ( cd "$fs_ndb" ; $exec_mgmtsrvr -f config.ini ) ; then :; else
|
|
echo "Unable to start $exec_mgmtsrvr from `pwd`"
|
|
exit 1
|
|
fi
|
|
if sleep_until_file_created $fs_ndb/ndb_`expr $ndbd_nodes + 1`.pid 120
|
|
then :; else
|
|
exit 1
|
|
fi
|
|
cat `find "$fs_ndb" -name 'ndb_*.pid'` > "$fs_ndb/$pidfile"
|
|
|
|
# Start database node
|
|
|
|
id=1
|
|
while [ $id -le $ndbd_nodes ]
|
|
do
|
|
if [ `expr $VERBOSE \> 1` = 1 ] ; then
|
|
echo "Starting ndbd $id($ndbd_nodes)"
|
|
fi
|
|
( cd "$fs_ndb" ; $exec_ndb $flags_ndb & )
|
|
if sleep_until_file_created $fs_ndb/ndb_${id}.pid 120
|
|
then :; else
|
|
stop_default_ndbcluster
|
|
exit 1
|
|
fi
|
|
cat `find "$fs_ndb" -name 'ndb_*.pid'` > "$fs_ndb/$pidfile"
|
|
id=`expr $id + 1`
|
|
done
|
|
|
|
# test if Ndb Cluster starts properly
|
|
|
|
if [ `expr $VERBOSE \> 1` = 1 ] ; then
|
|
echo "Waiting for NDB data nodes to start..."
|
|
fi
|
|
if ( $exec_waiter ) | grep "NDBT_ProgramExit: 0 - OK" > /dev/null 2>&1 ; then :; else
|
|
if [ `expr $VERBOSE \> 0` = 1 ] ; then
|
|
echo "Ndbcluster startup failed"
|
|
fi
|
|
stop_default_ndbcluster
|
|
exit 1
|
|
fi
|
|
if [ `expr $VERBOSE \> 1` = 1 ] ; then
|
|
echo "Ok"
|
|
fi
|
|
|
|
cat `find "$fs_ndb" -name 'ndb_*.pid'` > $fs_ndb/$pidfile
|
|
|
|
if [ `expr $VERBOSE \> 2` = 1 ] ; then
|
|
status_ndbcluster
|
|
fi
|
|
}
|
|
|
|
status_ndbcluster() {
|
|
# Start management client
|
|
$exec_mgmtclient -e show
|
|
}
|
|
|
|
stop_default_ndbcluster() {
|
|
|
|
# Start management client
|
|
|
|
exec_mgmtclient="$exec_mgmtclient --try-reconnect=1"
|
|
|
|
$exec_mgmtclient -e shutdown 2>&1 | cat > /dev/null
|
|
|
|
if [ -f "$fs_ndb/$pidfile" ] ; then
|
|
kill_pids=`cat "$fs_ndb/$pidfile"`
|
|
attempt=0
|
|
while [ $attempt -lt 10 ] ; do
|
|
new_kill_pid=""
|
|
kill_pids2=""
|
|
for p in $kill_pids ; do
|
|
kill -0 $p 2> /dev/null
|
|
if [ $? -eq 0 ] ; then
|
|
new_kill_pid="$p $new_kill_pid"
|
|
kill_pids2="-$p $kill_pids2"
|
|
fi
|
|
done
|
|
kill_pids=$new_kill_pid
|
|
if [ -z "$kill_pids" ] ; then
|
|
break
|
|
fi
|
|
sleep 1
|
|
attempt=`expr $attempt + 1`
|
|
done
|
|
if [ "$kill_pids2" != "" ] ; then
|
|
echo "Failed to shutdown ndbcluster, executing kill "$kill_pids2
|
|
kill -9 -- $kill_pids2 2> /dev/null
|
|
/bin/kill -9 -- $kill_pids2 2> /dev/null
|
|
/usr/bin/kill -9 -- $kill_pids2 2> /dev/null
|
|
kill -9 $kill_pids2 2> /dev/null
|
|
/bin/kill -9 $kill_pids2 2> /dev/null
|
|
/usr/bin/kill -9 $kill_pids2 2> /dev/null
|
|
fi
|
|
rm "$fs_ndb/$pidfile"
|
|
fi
|
|
}
|
|
|
|
initialize_ndb_test ()
|
|
{
|
|
fs_result=$fs_ndb/r
|
|
rm -rf $fs_result
|
|
mkdir $fs_result
|
|
echo ------------------
|
|
echo starting ndb tests
|
|
echo ------------------
|
|
}
|
|
|
|
do_ndb_test ()
|
|
{
|
|
test_name=$1
|
|
|
|
clusterlog=$fs_ndb/ndb_3_cluster.log
|
|
|
|
test_log_result=$fs_result/${test_name}_log.result
|
|
test_log_reject=$fs_result/${test_name}_log.reject
|
|
test_result=$fs_result/${test_name}.result
|
|
test_reject=$fs_result/${test_name}.reject
|
|
|
|
clean_log='s/.*\[MgmSrvr\]//'
|
|
|
|
cat $clusterlog ndb/${test_name}_log.result | sed -e $clean_log > $test_log_result
|
|
|
|
cp ndb/${test_name}.result $test_result
|
|
|
|
cat ndb/${test_name}.test | $exec_mgmtclient > $test_reject
|
|
cat $clusterlog | sed -e $clean_log > $test_log_reject
|
|
|
|
t="pass"
|
|
diff -C 5 $test_result $test_reject || t="fail"
|
|
printf "ndb_mgm output %20s [%s]\n" $test_name $t
|
|
t="pass"
|
|
diff -C 5 $test_log_result $test_log_reject || t="fail"
|
|
printf "clusterlog output %20s [%s]\n" $test_name $t
|
|
}
|
|
|
|
if [ $status_ndb ] ; then
|
|
status_ndbcluster
|
|
exit 0
|
|
fi
|
|
|
|
if [ $stop_ndb ] ; then
|
|
stop_default_ndbcluster
|
|
else
|
|
start_default_ndbcluster
|
|
fi
|
|
|
|
if [ $test_ndb ] ; then
|
|
initialize_ndb_test
|
|
all_tests=`ls ndb/*.test | sed "s#ndb/##" | sed "s#.test##"`
|
|
for a in $all_tests ; do
|
|
do_ndb_test $a
|
|
done
|
|
echo ------------------
|
|
echo shutting down cluster
|
|
stop_default_ndbcluster
|
|
fi
|
|
|
|
exit 0
|