mirror of
				https://github.com/MariaDB/server.git
				synced 2025-11-03 14:33:32 +03:00 
			
		
		
		
	into mysql.com:/home/kent/bk/main/mysql-5.1 BUILD/Makefile.am: Auto merged BitKeeper/deleted/.del-ArrayFifoList.hpp~7036ae04dd7e7bd2: Auto merged BitKeeper/deleted/.del-ArrayList.hpp~44695d09b1a02179: Auto merged BitKeeper/deleted/.del-DbtupLCP.cpp~855b1ed3fbc86a42: Auto merged BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d: Auto merged BitKeeper/deleted/.del-DbtupUndoLog.cpp~5a2ef6e86b1404e9: Auto merged Makefile.am: Auto merged BitKeeper/deleted/.del-Makefile.am~2: Auto merged BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e: Auto merged BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7: 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-MemoryChannelOSE.hpp: Auto merged BitKeeper/deleted/.del-MetaData.cpp~146ae9865dd35829: Auto merged BitKeeper/deleted/.del-MetaData.hpp~538342afcd8ac53c: Auto merged BitKeeper/deleted/.del-NdbCondition.c~ad83464328ab37af: Auto merged BitKeeper/deleted/.del-NdbCondition.c~ee56562abdd718cf: Auto merged BitKeeper/deleted/.del-NdbConditionOSE.h~455dd2c29c2e6344: Auto merged BitKeeper/deleted/.del-NdbDaemon.c~3b8101f376b28df: Auto merged BitKeeper/deleted/.del-NdbEnv.c~207f9ce9754c9e8a: Auto merged BitKeeper/deleted/.del-NdbEnv.c~bb6fe7572d45288a: Auto merged BitKeeper/deleted/.del-NdbErrHnd.cpp: Auto merged BitKeeper/deleted/.del-NdbHost.c~2c29816c77396d7b: Auto merged BitKeeper/deleted/.del-NdbHost.c~cf18d6b3c825180c: Auto merged BitKeeper/deleted/.del-NdbMem.c~6285b159985d46da: Auto merged BitKeeper/deleted/.del-NdbMem.c~6c2b317c1ce230ab: Auto merged BitKeeper/deleted/.del-NdbMem_SoftOse.cpp~9c61e311ec168d44: Auto merged BitKeeper/deleted/.del-NdbMutex.c~768131269bccca10: Auto merged BitKeeper/deleted/.del-NdbMutex.c~f4bdd19be08b84ab: Auto merged BitKeeper/deleted/.del-NdbOut.cpp~8caa99a0d729540c: Auto merged BitKeeper/deleted/.del-NdbSleep.c~b643ea3e7103eb62: Auto merged BitKeeper/deleted/.del-NdbSleep.c~b88fbc5b140de10d: Auto merged BitKeeper/deleted/.del-NdbTCP.c~1e9f416992352f6d: Auto merged BitKeeper/deleted/.del-NdbTCP.c~b09cdcbef3ea2c57: Auto merged BitKeeper/deleted/.del-NdbThread.c~2fe1fa5f47801772: Auto merged BitKeeper/deleted/.del-NdbThread.c~fe71a67b5c3a4724: Auto merged BitKeeper/deleted/.del-NdbTick.c~aa6385567216509d: Auto merged BitKeeper/deleted/.del-NdbTick.c~b76feba2cf1493d1: Auto merged BitKeeper/deleted/.del-OSE_Receiver.cpp: Auto merged BitKeeper/deleted/.del-OSE_Receiver.hpp: Auto merged BitKeeper/deleted/.del-OSE_Signals.hpp: Auto merged BitKeeper/deleted/.del-OSE_Transporter.cpp: Auto merged BitKeeper/deleted/.del-OSE_Transporter.hpp: Auto merged BitKeeper/deleted/.del-TraceNdbApi.hpp~7a7f0ae5b70358bc: Auto merged BitKeeper/deleted/.del-VerifyNdbApi.hpp~f417f78f7cd05935: Auto merged BitKeeper/deleted/.del-bcd.h~81fbfcc1530534da: Auto merged BitKeeper/deleted/.del-config-os2.h~a16b51851ddd317b: Auto merged BitKeeper/deleted/.del-dbGenerator.c~7509c19f70cad0bf: Auto merged BitKeeper/deleted/.del-dbGenerator.h~63f1aeb98260bcb7: Auto merged BitKeeper/deleted/.del-dbGenerator.h~e1aaa6725999d458: Auto merged BitKeeper/deleted/.del-dbPopulate.c~5dcff1c99783d83b: Auto merged BitKeeper/deleted/.del-dbPopulate.h~229a894b59d4da73: Auto merged BitKeeper/deleted/.del-ha_berkeley.cc: Auto merged BitKeeper/deleted/.del-ha_berkeley.h: Auto merged BitKeeper/deleted/.del-localDbPrepare.c~33a2c46afc8fac9a: Auto merged BitKeeper/deleted/.del-macros.h~58097d584e29b5df: Auto merged BitKeeper/deleted/.del-macros.h~742871fab0681964: Auto merged BitKeeper/deleted/.del-mainGenerator.c~2d1c8016f72b2517: Auto merged BitKeeper/deleted/.del-mainPopulate.c~37def9a44980b8ec: Auto merged BitKeeper/deleted/.del-mgmapi_logevent.cpp~f1e7cf3e70edc4: Auto merged BitKeeper/deleted/.del-mmslist.cpp: Auto merged BitKeeper/deleted/.del-my_lread.c: Auto merged BitKeeper/deleted/.del-my_lwrite.c: Auto merged BitKeeper/deleted/.del-my_os2cond.c~e3b520af1c371bb5: Auto merged BitKeeper/deleted/.del-my_os2dirsrch.c~4e2479b2abb2eb5a: Auto merged BitKeeper/deleted/.del-my_os2dirsrch.h~5011cbc657537d0: Auto merged BitKeeper/deleted/.del-my_os2dlfcn.c~6d94b488717683dd: Auto merged BitKeeper/deleted/.del-my_os2dlfcn.h0~eae8edb8555eff87: Auto merged BitKeeper/deleted/.del-my_os2file64.c~251fb8a1e950c31b: Auto merged BitKeeper/deleted/.del-my_os2thread.c~65dca991548cec2a: Auto merged BitKeeper/deleted/.del-my_os2tls.c~58ade7a0f70ad5ea: Auto merged BitKeeper/deleted/.del-mysqlmanager-pwgen.c~d8f5f91ec54432b9: Auto merged BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Auto merged BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6: Auto merged BitKeeper/deleted/.del-ndb_error.hpp~24468bb7f20a0b41: Auto merged BitKeeper/deleted/.del-ndb_error.hpp~45a2fef922beae3: Auto merged BitKeeper/deleted/.del-ndb_schema.hpp~de9c21185d6bfe4e: Auto merged BitKeeper/deleted/.del-ndbapi_async.cpp~319189569fb659ec: Auto merged BitKeeper/deleted/.del-ndbapi_async1.cpp~2995dac9b963a0d: Auto merged BitKeeper/deleted/.del-ndbapi_event.cpp~c5d949802966180: Auto merged BitKeeper/deleted/.del-ndbapi_retries.cpp~7301496d8c1c310a: Auto merged BitKeeper/deleted/.del-ndbapi_scan.cpp~14ed2aa9a5d9e597: Auto merged BitKeeper/deleted/.del-ndbapi_simple.cpp~80962179f3c2f5b8: Auto merged BitKeeper/deleted/.del-ndbapi_simple_index.cpp~4b95a4d71808b5b6: Auto merged BitKeeper/deleted/.del-print-limit-table~b8e808031daa3758: Auto merged BitKeeper/deleted/.del-raid.cc~488f5fa6538394e1: Auto merged BitKeeper/deleted/.del-raid.h~2d2503a66b128ac6: Auto merged BitKeeper/deleted/.del-raid2.c~fe7aea5fb4b9748c: Auto merged BitKeeper/deleted/.del-sql_manager.h: Auto merged BitKeeper/deleted/.del-testData.h~696038ea2623a90b: Auto merged BitKeeper/deleted/.del-testData.h~898b71d7c639319e: Auto merged BitKeeper/deleted/.del-testDefinitions.h~f18a4553579a3725: Auto merged BitKeeper/deleted/.del-userHandle.h~3275bb415e1ca2c2: Auto merged BitKeeper/deleted/.del-userHandle.h~ec22dc7a7ed2f81b: Auto merged BitKeeper/deleted/.del-userInterface.cpp~82ee612ab14b3d48: Auto merged BitKeeper/deleted/.del-userInterface.c~92a20032f7d1e91: Auto merged BitKeeper/deleted/.del-userInterface.h~1f76ad2f28b283fd: Auto merged BitKeeper/deleted/.del-userInterface.h~49139f029bbdaabc: Auto merged BitKeeper/deleted/.del-userTransaction.c~438012ecc761b776: Auto merged BitKeeper/deleted/.del-userTransaction.c~f50661b4f54b0bdd: Auto merged BitKeeper/deleted/.del-utv.h~f64af026b9705ebb: Auto merged BitKeeper/deleted/.del-vcdrfunc.h~85803875180684cd: Auto merged BitKeeper/deleted/.del-waiter.cpp~b188e4bfddf2cf98: Auto merged Docs/Makefile.am: Auto merged client/Makefile.am: Auto merged client/client_priv.h: Auto merged client/get_password.c: Auto merged client/mysql.cc: Auto merged client/mysql_upgrade.c: Auto merged client/mysqladmin.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged dbug/Makefile.am: Auto merged extra/Makefile.am: Auto merged extra/comp_err.c: Auto merged extra/perror.c: Auto merged extra/replace.c: Auto merged extra/resolveip.c: Auto merged include/Makefile.am: Auto merged include/base64.h: Auto merged include/config-netware.h: Auto merged include/config-win.h: Auto merged include/decimal.h: Auto merged include/errmsg.h: Auto merged include/ft_global.h: Auto merged include/heap.h: Auto merged include/m_ctype.h: Auto merged include/m_string.h: Auto merged include/my_base.h: Auto merged include/my_bitmap.h: Auto merged include/my_dbug.h: Auto merged include/my_global.h: Auto merged include/my_net.h: Auto merged include/my_no_pthread.h: Auto merged include/my_nosys.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/my_time.h: Auto merged include/my_tree.h: Auto merged include/my_xml.h: Auto merged include/myisam.h: Auto merged include/myisammrg.h: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged include/mysys_err.h: Auto merged include/queues.h: Auto merged include/thr_alarm.h: Auto merged include/thr_lock.h: Auto merged include/violite.h: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/emb_qcache.cc: Auto merged libmysqld/embedded_priv.h: Auto merged libmysqld/examples/Makefile.am: Auto merged libmysqld/libmysqld.c: Auto merged mysql-test/Makefile.am: Auto merged mysys/Makefile.am: Auto merged mysys/array.c: Auto merged mysys/base64.c: Auto merged mysys/charset-def.c: Auto merged mysys/default.c: Auto merged mysys/default_modify.c: Auto merged mysys/errors.c: Auto merged mysys/hash.c: Auto merged mysys/mf_dirname.c: Auto merged mysys/mf_format.c: Auto merged mysys/mf_iocache.c: Auto merged mysys/mf_iocache2.c: Auto merged mysys/mf_keycache.c: Auto merged mysys/mf_pack.c: Auto merged mysys/mf_path.c: Auto merged mysys/mf_tempdir.c: Auto merged mysys/mf_tempfile.c: Auto merged mysys/my_access.c: Auto merged mysys/my_alloc.c: Auto merged mysys/my_append.c: Auto merged mysys/my_bit.c: Auto merged mysys/my_bitmap.c: Auto merged mysys/my_clock.c: Auto merged mysys/my_compress.c: Auto merged mysys/my_copy.c: Auto merged mysys/my_create.c: Auto merged mysys/my_dup.c: Auto merged mysys/my_error.c: Auto merged mysys/my_file.c: Auto merged mysys/my_gethostbyname.c: Auto merged mysys/my_getopt.c: Auto merged mysys/my_getwd.c: Auto merged mysys/my_handler.c: Auto merged mysys/my_init.c: Auto merged mysys/my_lib.c: Auto merged mysys/my_lock.c: Auto merged mysys/my_malloc.c: Auto merged mysys/my_mkdir.c: Auto merged mysys/my_mmap.c: Auto merged mysys/my_net.c: Auto merged mysys/my_once.c: Auto merged mysys/my_open.c: Auto merged mysys/my_pread.c: Auto merged mysys/my_pthread.c: Auto merged mysys/my_redel.c: Auto merged mysys/my_rename.c: Auto merged mysys/my_seek.c: Auto merged mysys/my_sleep.c: Auto merged mysys/my_static.c: Auto merged mysys/my_symlink2.c: Auto merged mysys/my_thr_init.c: Auto merged mysys/mysys_priv.h: Auto merged mysys/ptr_cmp.c: Auto merged mysys/queues.c: Auto merged mysys/safemalloc.c: Auto merged mysys/string.c: Auto merged mysys/test_dir.c: Auto merged mysys/testhash.c: Auto merged mysys/thr_alarm.c: Auto merged mysys/thr_lock.c: Auto merged mysys/thr_mutex.c: Auto merged regex/Makefile.am: Auto merged scripts/Makefile.am: Auto merged server-tools/instance-manager/Makefile.am: Auto merged server-tools/instance-manager/buffer.cc: Auto merged server-tools/instance-manager/command.cc: Auto merged server-tools/instance-manager/command.h: Auto merged server-tools/instance-manager/commands.cc: Auto merged server-tools/instance-manager/commands.h: Auto merged server-tools/instance-manager/guardian.cc: Auto merged server-tools/instance-manager/guardian.h: Auto merged server-tools/instance-manager/instance.cc: Auto merged server-tools/instance-manager/instance.h: Auto merged server-tools/instance-manager/instance_map.cc: Auto merged server-tools/instance-manager/instance_map.h: Auto merged server-tools/instance-manager/instance_options.cc: Auto merged server-tools/instance-manager/instance_options.h: Auto merged server-tools/instance-manager/listener.cc: Auto merged server-tools/instance-manager/listener.h: 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/manager.h: Auto merged server-tools/instance-manager/messages.cc: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged server-tools/instance-manager/mysql_connection.h: Auto merged server-tools/instance-manager/mysql_manager_error.h: 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/parse.cc: Auto merged server-tools/instance-manager/parse.h: Auto merged server-tools/instance-manager/parse_output.cc: Auto merged server-tools/instance-manager/parse_output.h: Auto merged server-tools/instance-manager/priv.cc: Auto merged server-tools/instance-manager/priv.h: 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/field_conv.cc: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster.h: 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_cmpfunc.h: Auto merged sql/item_create.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_geofunc.cc: Auto merged sql/item_geofunc.h: Auto merged sql/item_row.cc: Auto merged sql/item_row.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/item_uniq.cc: Auto merged sql/key.cc: Auto merged sql/lex.h: Auto merged sql/lex_symbol.h: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log_event.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/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/parse_file.cc: Auto merged sql/parse_file.h: Auto merged sql/password.c: Auto merged sql/procedure.h: Auto merged sql/protocol.cc: Auto merged sql/protocol.h: Auto merged sql/records.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sp.cc: Auto merged sql/sp.h: Auto merged sql/sp_cache.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/spatial.cc: Auto merged sql/spatial.h: Auto merged sql/sql_acl.cc: 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_bitmap.h: Auto merged sql/sql_cache.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_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_derived.cc: Auto merged sql/sql_do.cc: Auto merged sql/sql_error.cc: Auto merged sql/sql_error.h: Auto merged sql/sql_handler.cc: Auto merged sql/sql_help.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_list.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_prepare.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_string.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_trigger.h: Auto merged sql/sql_udf.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: 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/share/charsets/Index.xml: Auto merged sql/share/charsets/cp1250.xml: Auto merged sql/sql_view.h: Auto merged sql/sql_yacc.yy: Auto merged sql/stacktrace.c: Auto merged sql/stacktrace.h: Auto merged sql/strfunc.cc: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/time.cc: Auto merged sql/tztime.cc: Auto merged sql/tztime.h: Auto merged sql/udf_example.c: Auto merged sql/unireg.cc: Auto merged sql/unireg.h: 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/client.c: Auto merged sql-common/my_time.c: Auto merged storage/archive/ha_archive.cc: Auto merged storage/archive/ha_archive.h: Auto merged storage/blackhole/ha_blackhole.cc: Auto merged storage/blackhole/ha_blackhole.h: Auto merged storage/csv/ha_tina.cc: Auto merged storage/csv/ha_tina.h: Auto merged storage/example/ha_example.cc: Auto merged storage/example/ha_example.h: Auto merged storage/federated/ha_federated.cc: Auto merged storage/federated/ha_federated.h: 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/handler/ha_innodb.cc: Auto merged storage/innobase/handler/ha_innodb.h: 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_eval.h: 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_keycache.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/myisamchk.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.c: 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_key.c: 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/include/debugger/DebuggerNames.hpp: Auto merged storage/ndb/include/debugger/EventLogger.hpp: Auto merged storage/ndb/include/debugger/GrepError.hpp: Auto merged storage/ndb/include/debugger/SignalLoggerManager.hpp: Auto merged storage/ndb/include/ndb_constants.h: Auto merged storage/ndb/include/ndb_global.h.in: Auto merged storage/ndb/include/ndb_init.h: Auto merged storage/ndb/include/ndb_types.h.in: Auto merged storage/ndb/include/ndb_version.h.in: Auto merged storage/ndb/include/editline/editline.h: Auto merged storage/ndb/include/kernel/AttributeDescriptor.hpp: Auto merged storage/ndb/include/kernel/AttributeHeader.hpp: Auto merged storage/ndb/include/kernel/AttributeList.hpp: Auto merged storage/ndb/include/kernel/BlockNumbers.h: Auto merged storage/ndb/include/kernel/GlobalSignalNumbers.h: Auto merged storage/ndb/include/kernel/GrepEvent.hpp: Auto merged storage/ndb/include/kernel/Interpreter.hpp: Auto merged storage/ndb/include/kernel/LogLevel.hpp: Auto merged storage/ndb/include/kernel/NodeBitmask.hpp: Auto merged storage/ndb/include/kernel/NodeInfo.hpp: Auto merged storage/ndb/include/kernel/NodeState.hpp: Auto merged storage/ndb/include/kernel/RefConvert.hpp: Auto merged storage/ndb/include/kernel/kernel_types.h: Auto merged storage/ndb/include/kernel/ndb_limits.h: Auto merged storage/ndb/include/kernel/signaldata/AbortAll.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccScan.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiVersion.hpp: Auto merged storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/AttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/BuildIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp: Auto merged storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CmInit.hpp: Auto merged storage/ndb/include/kernel/trigger_definitions.h: Auto merged storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ConfigParamId.hpp: Auto merged storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyActive.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateEvnt.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/DiAddTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DiGetNodes.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictStart.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictTabInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihAddFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihStartTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp: Auto merged storage/ndb/include/kernel/signaldata/DisconnectRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTabFile.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/EmptyLcp.hpp: Auto merged storage/ndb/include/kernel/signaldata/EndTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/EventReport.hpp: Auto merged storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ExecFragReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FailRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsAppendReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsCloseReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsOpenReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/GCPSave.hpp: Auto merged storage/ndb/include/kernel/signaldata/GetTabInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/GetTableId.hpp: Auto merged storage/ndb/include/kernel/signaldata/GrepImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/HotSpareRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/KeyInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/LCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/ListTables.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhKey.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhTransConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/ManagementServer.hpp: Auto merged storage/ndb/include/kernel/signaldata/MasterGCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/MasterLCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/NdbSttor.hpp: Auto merged storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/NextScan.hpp: Auto merged storage/ndb/include/kernel/signaldata/NodeFailRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/PackedSignal.hpp: Auto merged storage/ndb/include/kernel/signaldata/PrepDropTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/RelTabMem.hpp: Auto merged storage/ndb/include/kernel/signaldata/RepImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/ResumeReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ScanFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/ScanTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/SetVarReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/SrFragidConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartFragReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartMe.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartPerm.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartRec.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopMe.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopPerm.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/SumaImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/SystemError.hpp: Auto merged storage/ndb/include/kernel/signaldata/TamperOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcCommit.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcHbRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TestOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/TransIdAI.hpp: Auto merged storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupCommit.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupKey.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxBound.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxMaint.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/UpdateTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilDelete.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilExecute.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilPrepare.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilRelease.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilSequence.hpp: Auto merged storage/ndb/include/kernel/signaldata/WaitGCP.hpp: Auto merged storage/ndb/include/logger/ConsoleLogHandler.hpp: Auto merged storage/ndb/include/logger/FileLogHandler.hpp: Auto merged storage/ndb/include/logger/LogHandler.hpp: Auto merged storage/ndb/include/logger/Logger.hpp: Auto merged storage/ndb/include/logger/SysLogHandler.hpp: Auto merged storage/ndb/include/mgmapi/mgmapi.h: Auto merged storage/ndb/include/mgmapi/mgmapi_debug.h: Auto merged storage/ndb/include/mgmapi/ndb_logevent.h: Auto merged storage/ndb/include/mgmapi/ndbd_exit_codes.h: Auto merged storage/ndb/include/mgmcommon/ConfigRetriever.hpp: Auto merged storage/ndb/include/mgmcommon/IPCConfig.hpp: Auto merged storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp: Auto merged storage/ndb/include/ndbapi/Ndb.hpp: Auto merged storage/ndb/include/ndbapi/NdbApi.hpp: Auto merged storage/ndb/include/ndbapi/NdbBlob.hpp: Auto merged storage/ndb/include/ndbapi/NdbDictionary.hpp: Auto merged storage/ndb/include/ndbapi/NdbError.hpp: Auto merged storage/ndb/include/ndbapi/NdbEventOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbIndexOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbPool.hpp: Auto merged storage/ndb/include/ndbapi/NdbRecAttr.hpp: Auto merged storage/ndb/include/ndbapi/NdbReceiver.hpp: Auto merged storage/ndb/include/ndbapi/NdbScanFilter.hpp: Auto merged storage/ndb/include/ndbapi/NdbScanOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbTransaction.hpp: Auto merged storage/ndb/include/ndbapi/ndb_cluster_connection.hpp: Auto merged storage/ndb/include/ndbapi/ndb_opt_defaults.h: Auto merged storage/ndb/include/ndbapi/ndbapi_limits.h: Auto merged storage/ndb/include/ndbapi/ndberror.h: Auto merged storage/ndb/include/newtonapi/dba.h: Auto merged storage/ndb/include/newtonapi/defs/pcn_types.h: Auto merged storage/ndb/include/portlib/NdbCondition.h: Auto merged storage/ndb/include/portlib/NdbConfig.h: Auto merged storage/ndb/include/portlib/NdbDaemon.h: Auto merged storage/ndb/include/portlib/NdbEnv.h: Auto merged storage/ndb/include/portlib/NdbHost.h: Auto merged storage/ndb/include/portlib/NdbMain.h: Auto merged storage/ndb/include/portlib/NdbMem.h: Auto merged storage/ndb/include/portlib/NdbMutex.h: Auto merged storage/ndb/include/portlib/NdbSleep.h: Auto merged storage/ndb/include/portlib/NdbTCP.h: Auto merged storage/ndb/include/portlib/NdbThread.h: Auto merged storage/ndb/include/portlib/NdbTick.h: Auto merged storage/ndb/include/portlib/PortDefs.h: Auto merged storage/ndb/include/portlib/prefetch.h: Auto merged storage/ndb/include/transporter/TransporterCallback.hpp: Auto merged storage/ndb/include/transporter/TransporterDefinitions.hpp: Auto merged storage/ndb/include/transporter/TransporterRegistry.hpp: Auto merged storage/ndb/include/util/BaseString.hpp: Auto merged storage/ndb/include/util/Bitmask.hpp: Auto merged storage/ndb/include/util/File.hpp: Auto merged storage/ndb/include/util/InputStream.hpp: Auto merged storage/ndb/include/util/NdbAutoPtr.hpp: Auto merged storage/ndb/include/util/NdbOut.hpp: Auto merged storage/ndb/include/util/NdbSqlUtil.hpp: Auto merged storage/ndb/include/util/OutputStream.hpp: Auto merged storage/ndb/include/util/Parser.hpp: Auto merged storage/ndb/include/util/Properties.hpp: Auto merged storage/ndb/include/util/SimpleProperties.hpp: Auto merged storage/ndb/include/util/SocketAuthenticator.hpp: Auto merged storage/ndb/include/util/SocketClient.hpp: Auto merged storage/ndb/include/util/SocketServer.hpp: Auto merged storage/ndb/include/util/UtilBuffer.hpp: Auto merged storage/ndb/include/util/Vector.hpp: Auto merged storage/ndb/include/util/basestring_vsnprintf.h: Auto merged storage/ndb/include/util/md5_hash.hpp: Auto merged storage/ndb/include/util/ndb_opts.h: Auto merged storage/ndb/include/util/random.h: Auto merged storage/ndb/include/util/socket_io.h: Auto merged storage/ndb/include/util/uucode.h: Auto merged storage/ndb/include/util/version.h: Auto merged storage/ndb/src/common/debugger/BlockNames.cpp: Auto merged storage/ndb/src/common/debugger/DebuggerNames.cpp: Auto merged storage/ndb/src/common/debugger/EventLogger.cpp: Auto merged storage/ndb/src/common/debugger/GrepError.cpp: Auto merged storage/ndb/src/common/debugger/SignalLoggerManager.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AccLock.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTable.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FailRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/GCPSave.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LCP.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhKey.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ScanTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalNames.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/StartRec.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SystemError.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TupCommit.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TupKey.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilLock.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp: Auto merged storage/ndb/src/common/logger/ConsoleLogHandler.cpp: Auto merged storage/ndb/src/common/logger/FileLogHandler.cpp: Auto merged storage/ndb/src/common/logger/LogHandler.cpp: Auto merged storage/ndb/src/common/logger/LogHandlerList.cpp: Auto merged storage/ndb/src/common/logger/LogHandlerList.hpp: Auto merged storage/ndb/src/common/logger/Logger.cpp: Auto merged storage/ndb/src/common/logger/SysLogHandler.cpp: Auto merged storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp: Auto merged storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp: Auto merged storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp: Auto merged storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp: Auto merged storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged storage/ndb/src/common/mgmcommon/IPCConfig.cpp: Auto merged storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp: Auto merged storage/ndb/src/common/portlib/NdbCondition.c: Auto merged storage/ndb/src/common/portlib/NdbConfig.c: Auto merged storage/ndb/src/common/portlib/NdbDaemon.c: Auto merged storage/ndb/src/common/portlib/NdbEnv.c: Auto merged storage/ndb/src/common/portlib/NdbHost.c: Auto merged storage/ndb/src/common/portlib/NdbMem.c: Auto merged storage/ndb/src/common/portlib/NdbMutex.c: Auto merged storage/ndb/src/common/portlib/NdbPortLibTest.cpp: Auto merged storage/ndb/src/common/portlib/NdbSleep.c: Auto merged storage/ndb/src/common/portlib/NdbTCP.cpp: Auto merged storage/ndb/src/common/portlib/NdbThread.c: Auto merged storage/ndb/src/common/portlib/NdbTick.c: Auto merged storage/ndb/src/common/portlib/memtest.c: Auto merged storage/ndb/src/common/portlib/mmstest.cpp: Auto merged storage/ndb/src/common/portlib/munmaptest.cpp: Auto merged storage/ndb/src/common/portlib/win32/NdbCondition.c: Auto merged storage/ndb/src/common/portlib/win32/NdbDaemon.c: Auto merged storage/ndb/src/common/portlib/win32/NdbEnv.c: Auto merged storage/ndb/src/common/portlib/win32/NdbHost.c: Auto merged storage/ndb/src/common/portlib/win32/NdbMem.c: Auto merged storage/ndb/src/common/portlib/win32/NdbMutex.c: Auto merged storage/ndb/src/common/portlib/win32/NdbSleep.c: Auto merged storage/ndb/src/common/portlib/win32/NdbTCP.c: Auto merged storage/ndb/src/common/portlib/win32/NdbThread.c: Auto merged storage/ndb/src/common/portlib/win32/NdbTick.c: Auto merged storage/ndb/src/common/transporter/Packer.cpp: Auto merged storage/ndb/src/common/transporter/Packer.hpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Buffer.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp: Auto merged storage/ndb/src/common/transporter/SendBuffer.cpp: Auto merged storage/ndb/src/common/transporter/SendBuffer.hpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/Transporter.cpp: Auto merged storage/ndb/src/common/transporter/Transporter.hpp: Auto merged storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp: Auto merged storage/ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/buddy.cpp: Auto merged storage/ndb/src/common/transporter/buddy.hpp: Auto merged storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp: Auto merged storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp: Auto merged storage/ndb/src/common/util/BaseString.cpp: Auto merged storage/ndb/src/common/util/File.cpp: Auto merged storage/ndb/src/common/util/InputStream.cpp: Auto merged storage/ndb/src/common/util/NdbOut.cpp: Auto merged storage/ndb/src/common/util/NdbSqlUtil.cpp: Auto merged storage/ndb/src/common/util/OutputStream.cpp: Auto merged storage/ndb/src/common/util/Parser.cpp: Auto merged storage/ndb/src/common/util/Properties.cpp: Auto merged storage/ndb/src/common/util/SimpleProperties.cpp: Auto merged storage/ndb/src/common/util/SocketAuthenticator.cpp: Auto merged storage/ndb/src/common/util/SocketClient.cpp: Auto merged storage/ndb/src/common/util/SocketServer.cpp: Auto merged storage/ndb/src/common/util/basestring_vsnprintf.c: Auto merged storage/ndb/src/common/util/md5_hash.cpp: Auto merged storage/ndb/src/common/util/ndb_init.c: Auto merged storage/ndb/src/common/util/random.c: Auto merged storage/ndb/src/common/util/socket_io.cpp: Auto merged storage/ndb/src/common/util/strdup.c: Auto merged storage/ndb/src/common/util/filetest/FileUnitTest.cpp: Auto merged storage/ndb/src/common/util/filetest/FileUnitTest.hpp: Auto merged storage/ndb/src/common/util/testProperties/testProperties.cpp: Auto merged storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp: Auto merged storage/ndb/src/common/util/uucode.c: Auto merged storage/ndb/src/common/util/version.c: Auto merged storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/TreeView.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/resource.h: Auto merged storage/ndb/src/cw/cpcd/APIService.cpp: Auto merged storage/ndb/src/cw/cpcd/APIService.hpp: Auto merged storage/ndb/src/cw/cpcd/CPCD.cpp: Auto merged storage/ndb/src/cw/cpcd/CPCD.hpp: Auto merged storage/ndb/src/cw/cpcd/Monitor.cpp: Auto merged storage/ndb/src/cw/cpcd/Process.cpp: Auto merged storage/ndb/src/cw/cpcd/common.cpp: Auto merged storage/ndb/src/cw/cpcd/common.hpp: Auto merged storage/ndb/src/cw/cpcd/main.cpp: Auto merged storage/ndb/src/cw/test/socketclient/socketClientTest.cpp: Auto merged storage/ndb/src/cw/util/ClientInterface.cpp: Auto merged storage/ndb/src/cw/util/ClientInterface.hpp: Auto merged storage/ndb/src/cw/util/SocketRegistry.cpp: Auto merged storage/ndb/src/cw/util/SocketRegistry.hpp: Auto merged storage/ndb/src/cw/util/SocketService.cpp: Auto merged storage/ndb/src/cw/util/SocketService.hpp: Auto merged storage/ndb/src/kernel/SimBlockList.cpp: Auto merged storage/ndb/src/kernel/blocks/mutexes.hpp: Auto merged storage/ndb/src/kernel/main.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/BackupInit.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/read.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp: Auto merged storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp: Auto merged storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/timer.hpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.hpp: Auto merged storage/ndb/src/kernel/blocks/suma/SumaInit.cpp: Auto merged storage/ndb/src/kernel/blocks/trix/Trix.cpp: Auto merged storage/ndb/src/kernel/blocks/trix/Trix.hpp: Auto merged storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.cpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.hpp: Auto merged storage/ndb/src/kernel/error/TimeModule.cpp: Auto merged storage/ndb/src/kernel/error/TimeModule.hpp: Auto merged storage/ndb/src/kernel/error/ndbd_exit_codes.c: Auto merged storage/ndb/src/kernel/vm/Array.hpp: Auto merged storage/ndb/src/kernel/vm/ArrayPool.hpp: Auto merged storage/ndb/src/kernel/vm/CArray.hpp: Auto merged storage/ndb/src/kernel/vm/Callback.hpp: Auto merged storage/ndb/src/kernel/vm/ClusterConfiguration.cpp: Auto merged storage/ndb/src/kernel/vm/ClusterConfiguration.hpp: Auto merged storage/ndb/src/kernel/vm/Configuration.cpp: Auto merged storage/ndb/src/kernel/vm/Configuration.hpp: Auto merged storage/ndb/src/kernel/vm/DLFifoList.hpp: Auto merged storage/ndb/src/kernel/vm/DLHashTable.hpp: Auto merged storage/ndb/src/kernel/vm/DLHashTable2.hpp: Auto merged storage/ndb/src/kernel/vm/DLList.hpp: Auto merged storage/ndb/src/kernel/vm/DataBuffer.hpp: Auto merged storage/ndb/src/kernel/vm/Emulator.cpp: Auto merged storage/ndb/src/kernel/vm/Emulator.hpp: Auto merged storage/ndb/src/kernel/vm/FastScheduler.cpp: Auto merged storage/ndb/src/kernel/vm/FastScheduler.hpp: Auto merged storage/ndb/src/kernel/vm/GlobalData.hpp: Auto merged storage/ndb/src/kernel/vm/KeyDescriptor.hpp: Auto merged storage/ndb/src/kernel/vm/KeyTable.hpp: Auto merged storage/ndb/src/kernel/vm/KeyTable2.hpp: Auto merged storage/ndb/src/kernel/vm/LongSignal.hpp: Auto merged storage/ndb/src/kernel/vm/Mutex.cpp: Auto merged storage/ndb/src/kernel/vm/Mutex.hpp: Auto merged storage/ndb/src/kernel/vm/Prio.hpp: Auto merged storage/ndb/src/kernel/vm/RequestTracker.hpp: Auto merged storage/ndb/src/kernel/vm/SLList.hpp: Auto merged storage/ndb/src/kernel/vm/SafeCounter.cpp: Auto merged storage/ndb/src/kernel/vm/SafeCounter.hpp: Auto merged storage/ndb/src/kernel/vm/SectionReader.cpp: Auto merged storage/ndb/src/kernel/vm/SectionReader.hpp: Auto merged storage/ndb/src/kernel/vm/SignalCounter.hpp: Auto merged storage/ndb/src/kernel/vm/SimBlockList.hpp: Auto merged storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.hpp: Auto merged storage/ndb/src/kernel/vm/SuperPool.cpp: Auto merged storage/ndb/src/kernel/vm/SuperPool.hpp: Auto merged storage/ndb/src/kernel/vm/ThreadConfig.cpp: Auto merged storage/ndb/src/kernel/vm/ThreadConfig.hpp: Auto merged storage/ndb/src/kernel/vm/TimeQueue.cpp: Auto merged storage/ndb/src/kernel/vm/TimeQueue.hpp: Auto merged storage/ndb/src/kernel/vm/TransporterCallback.cpp: Auto merged storage/ndb/src/kernel/vm/VMSignal.cpp: Auto merged storage/ndb/src/kernel/vm/VMSignal.hpp: Auto merged storage/ndb/src/kernel/vm/WaitQueue.hpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.cpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.hpp: Auto merged storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp: Auto merged storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp: Auto merged storage/ndb/src/kernel/vm/al_test/main.cpp: Auto merged storage/ndb/src/kernel/vm/ndbd_malloc.cpp: Auto merged storage/ndb/src/kernel/vm/ndbd_malloc.hpp: Auto merged storage/ndb/src/kernel/vm/pc.hpp: Auto merged storage/ndb/src/kernel/vm/testCopy/rr.cpp: Auto merged storage/ndb/src/kernel/vm/testCopy/testCopy.cpp: Auto merged storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp: Auto merged storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp: Auto merged storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp: Auto merged storage/ndb/src/kernel/vm/testSuperPool.cpp: Auto merged storage/ndb/src/mgmapi/LocalConfig.cpp: Auto merged storage/ndb/src/mgmapi/LocalConfig.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi_configuration.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi_internal.h: Auto merged storage/ndb/src/mgmapi/ndb_logevent.cpp: Auto merged storage/ndb/src/mgmapi/ndb_logevent.hpp: Auto merged storage/ndb/src/mgmapi/test/keso.c: Auto merged storage/ndb/src/mgmapi/test/mgmSrvApi.cpp: Auto merged storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged storage/ndb/src/mgmclient/main.cpp: Auto merged storage/ndb/src/mgmclient/ndb_mgmclient.hpp: Auto merged storage/ndb/src/mgmclient/ndb_mgmclient.h: Auto merged storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp: Auto merged storage/ndb/src/mgmsrv/Config.cpp: Auto merged storage/ndb/src/mgmsrv/Config.hpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.hpp: Auto merged storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged storage/ndb/src/mgmsrv/InitConfigFileParser.hpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/mgmsrv/Services.hpp: Auto merged storage/ndb/src/mgmsrv/SignalQueue.cpp: Auto merged storage/ndb/src/mgmsrv/SignalQueue.hpp: Auto merged storage/ndb/src/mgmsrv/convertStrToInt.cpp: Auto merged storage/ndb/src/mgmsrv/convertStrToInt.hpp: Auto merged storage/ndb/src/mgmsrv/main.cpp: Auto merged storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp: Auto merged storage/ndb/src/ndbapi/API.hpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.cpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.hpp: Auto merged storage/ndb/src/ndbapi/DictCache.cpp: Auto merged storage/ndb/src/ndbapi/DictCache.hpp: Auto merged storage/ndb/src/ndbapi/Ndb.cpp: Auto merged storage/ndb/src/ndbapi/NdbApiSignal.cpp: Auto merged storage/ndb/src/ndbapi/NdbApiSignal.hpp: Auto merged storage/ndb/src/ndbapi/NdbBlob.cpp: Auto merged storage/ndb/src/ndbapi/NdbBlobImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbDictionary.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbErrorOut.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbIndexOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbLinHash.hpp: Auto merged storage/ndb/src/ndbapi/NdbOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationExec.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationInt.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationScan.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationSearch.cpp: Auto merged storage/ndb/src/ndbapi/NdbPool.cpp: Auto merged storage/ndb/src/ndbapi/NdbPoolImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbPoolImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged storage/ndb/src/ndbapi/NdbReceiver.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanFilter.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransactionScan.cpp: Auto merged storage/ndb/src/ndbapi/NdbUtil.cpp: Auto merged storage/ndb/src/ndbapi/NdbUtil.hpp: Auto merged storage/ndb/src/ndbapi/NdbWaiter.hpp: Auto merged storage/ndb/src/ndbapi/Ndberr.cpp: Auto merged storage/ndb/src/ndbapi/Ndbif.cpp: Auto merged storage/ndb/src/ndbapi/Ndbinit.cpp: Auto merged storage/ndb/src/ndbapi/Ndblist.cpp: Auto merged storage/ndb/src/ndbapi/ObjectMap.hpp: Auto merged storage/ndb/src/ndbapi/SignalSender.cpp: Auto merged storage/ndb/src/ndbapi/SignalSender.hpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.cpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.hpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp: Auto merged storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp: Auto merged storage/ndb/test/include/CpcClient.hpp: Auto merged storage/ndb/test/include/HugoAsynchTransactions.hpp: Auto merged storage/ndb/test/include/HugoCalculator.hpp: Auto merged storage/ndb/test/include/HugoOperations.hpp: Auto merged storage/ndb/test/include/HugoTransactions.hpp: Auto merged storage/ndb/test/include/NDBT.hpp: Auto merged storage/ndb/test/include/NDBT_DataSet.hpp: Auto merged storage/ndb/test/include/NDBT_DataSetTransaction.hpp: Auto merged storage/ndb/test/include/NDBT_Error.hpp: Auto merged storage/ndb/test/include/NDBT_Output.hpp: Auto merged storage/ndb/test/include/NDBT_ResultRow.hpp: Auto merged storage/ndb/test/include/NDBT_ReturnCodes.h: Auto merged storage/ndb/test/include/NDBT_Stats.hpp: Auto merged storage/ndb/test/include/NDBT_Table.hpp: Auto merged storage/ndb/test/include/NDBT_Tables.hpp: Auto merged storage/ndb/test/include/NDBT_Test.hpp: Auto merged storage/ndb/test/include/NdbBackup.hpp: Auto merged storage/ndb/test/include/NdbConfig.hpp: Auto merged storage/ndb/test/include/NdbGrep.hpp: Auto merged storage/ndb/test/include/NdbRestarter.hpp: Auto merged storage/ndb/test/include/NdbRestarts.hpp: Auto merged storage/ndb/test/include/NdbSchemaCon.hpp: Auto merged storage/ndb/test/include/NdbSchemaOp.hpp: Auto merged storage/ndb/test/include/NdbTest.hpp: Auto merged storage/ndb/test/include/NdbTimer.hpp: Auto merged storage/ndb/test/include/TestNdbEventOperation.hpp: Auto merged storage/ndb/test/include/UtilTransactions.hpp: Auto merged storage/ndb/test/include/getarg.h: Auto merged storage/ndb/test/ndbapi/InsertRecs.cpp: Auto merged storage/ndb/test/ndbapi/ScanFilter.hpp: Auto merged storage/ndb/test/ndbapi/ScanFunctions.hpp: Auto merged storage/ndb/test/ndbapi/ScanInterpretTest.hpp: Auto merged storage/ndb/test/ndbapi/TraceNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/VerifyNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/acid.cpp: Auto merged storage/ndb/test/ndbapi/acid2.cpp: Auto merged storage/ndb/test/ndbapi/adoInsertRecs.cpp: Auto merged storage/ndb/test/ndbapi/asyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/benchronja.cpp: Auto merged storage/ndb/test/ndbapi/bulk_copy.cpp: Auto merged storage/ndb/test/ndbapi/cdrserver.cpp: Auto merged storage/ndb/test/ndbapi/celloDb.cpp: Auto merged storage/ndb/test/ndbapi/create_all_tabs.cpp: Auto merged storage/ndb/test/ndbapi/create_tab.cpp: Auto merged storage/ndb/test/ndbapi/drop_all_tabs.cpp: Auto merged storage/ndb/test/ndbapi/flexAsynch.cpp: Auto merged storage/ndb/test/ndbapi/flexBench.cpp: Auto merged storage/ndb/test/ndbapi/flexHammer.cpp: Auto merged storage/ndb/test/ndbapi/flexScan.cpp: Auto merged storage/ndb/test/ndbapi/flexTT.cpp: Auto merged storage/ndb/test/ndbapi/flexTimedAsynch.cpp: Auto merged storage/ndb/test/ndbapi/flex_bench_mysql.cpp: Auto merged storage/ndb/test/ndbapi/index.cpp: Auto merged storage/ndb/test/ndbapi/index2.cpp: Auto merged storage/ndb/test/ndbapi/initronja.cpp: Auto merged storage/ndb/test/ndbapi/interpreterInTup.cpp: Auto merged storage/ndb/test/ndbapi/mainAsyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/msa.cpp: Auto merged storage/ndb/test/ndbapi/ndb_async1.cpp: Auto merged storage/ndb/test/ndbapi/ndb_async2.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_populate.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction2.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction3.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction4.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction5.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction6.cpp: Auto merged storage/ndb/test/ndbapi/restarter.cpp: Auto merged storage/ndb/test/ndbapi/restarter2.cpp: Auto merged storage/ndb/test/ndbapi/restarts.cpp: Auto merged storage/ndb/test/ndbapi/size.cpp: Auto merged storage/ndb/test/ndbapi/testBackup.cpp: Auto merged storage/ndb/test/ndbapi/testBasic.cpp: Auto merged storage/ndb/test/ndbapi/testBasicAsynch.cpp: Auto merged storage/ndb/test/ndbapi/testBlobs.cpp: Auto merged storage/ndb/test/ndbapi/testDataBuffers.cpp: Auto merged storage/ndb/test/ndbapi/testDeadlock.cpp: Auto merged storage/ndb/test/ndbapi/testDict.cpp: Auto merged storage/ndb/test/ndbapi/testGrepVerify.cpp: Auto merged storage/ndb/test/ndbapi/testIndex.cpp: Auto merged storage/ndb/test/ndbapi/testInterpreter.cpp: Auto merged storage/ndb/test/ndbapi/testMgm.cpp: Auto merged storage/ndb/test/ndbapi/testNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged storage/ndb/test/ndbapi/testOIBasic.cpp: Auto merged storage/ndb/test/ndbapi/testOperations.cpp: Auto merged storage/ndb/test/ndbapi/testOrderedIndex.cpp: Auto merged storage/ndb/test/ndbapi/testPartitioning.cpp: Auto merged storage/ndb/test/ndbapi/testReadPerf.cpp: Auto merged storage/ndb/test/ndbapi/bank/Bank.cpp: Auto merged storage/ndb/test/ndbapi/bank/Bank.hpp: Auto merged storage/ndb/test/ndbapi/bank/BankLoad.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankCreator.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankMakeGL.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankTimer.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp: Auto merged storage/ndb/test/ndbapi/bank/testBank.cpp: Auto merged storage/ndb/test/ndbapi/bench/asyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/bench/dbGenerator.h: Auto merged storage/ndb/test/ndbapi/bench/dbPopulate.cpp: Auto merged storage/ndb/test/ndbapi/bench/dbPopulate.h: Auto merged storage/ndb/test/ndbapi/bench/macros.h: Auto merged storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/bench/mainPopulate.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_async1.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_async2.cpp: Auto merged storage/ndb/test/ndbapi/testRestartGci.cpp: Auto merged storage/ndb/test/ndbapi/testSRBank.cpp: Auto merged storage/ndb/test/ndbapi/testScan.cpp: Auto merged storage/ndb/test/ndbapi/testScanInterpreter.cpp: Auto merged storage/ndb/test/ndbapi/testScanPerf.cpp: Auto merged storage/ndb/test/ndbapi/testSystemRestart.cpp: Auto merged storage/ndb/test/ndbapi/testTimeout.cpp: Auto merged storage/ndb/test/ndbapi/testTransactions.cpp: Auto merged storage/ndb/test/ndbapi/test_event.cpp: Auto merged storage/ndb/test/ndbapi/test_event_merge.cpp: Auto merged storage/ndb/test/ndbapi/test_event_multi_table.cpp: Auto merged storage/ndb/test/ndbapi/userInterface.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_error.hpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_schema.hpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp: Auto merged storage/ndb/test/ndbapi/bench/testData.h: Auto merged storage/ndb/test/ndbapi/bench/testDefinitions.h: Auto merged storage/ndb/test/ndbapi/bench/userInterface.cpp: Auto merged storage/ndb/test/ndbapi/bench/userInterface.h: Auto merged storage/ndb/test/newtonapi/basic_test/basic/basic.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/common.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/common.hpp: Auto merged storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/too_basic.cpp: Auto merged storage/ndb/test/newtonapi/perf_test/perf.cpp: Auto merged storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp: Auto merged storage/ndb/test/odbc/SQL99_test/SQL99_test.h: Auto merged storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp: Auto merged storage/ndb/test/odbc/client/SQLBindColTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLBindParameterTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCancelTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp: Auto merged storage/ndb/test/odbc/client/SQLConnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCopyDescTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDescribeColTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDisconnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLEndTranTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLErrorTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLExecDirectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLExecuteTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFetchTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetInfoTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLParamDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLPrepareTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLPutDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLRowCountTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLTablesTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLTransactTest.cpp: Auto merged storage/ndb/test/odbc/client/common.hpp: Auto merged storage/ndb/test/odbc/client/main.cpp: Auto merged storage/ndb/test/odbc/driver/testOdbcDriver.cpp: Auto merged storage/ndb/test/odbc/test_compiler/test_compiler.cpp: Auto merged storage/ndb/test/run-test/main.cpp: Auto merged storage/ndb/test/run-test/run-test.hpp: Auto merged storage/ndb/test/src/CpcClient.cpp: Auto merged storage/ndb/test/src/HugoAsynchTransactions.cpp: Auto merged storage/ndb/test/src/HugoCalculator.cpp: Auto merged storage/ndb/test/src/HugoOperations.cpp: Auto merged storage/ndb/test/src/HugoTransactions.cpp: Auto merged storage/ndb/test/src/NDBT_Error.cpp: Auto merged storage/ndb/test/src/NDBT_Output.cpp: Auto merged storage/ndb/test/src/NDBT_ResultRow.cpp: Auto merged storage/ndb/test/src/NDBT_ReturnCodes.cpp: Auto merged storage/ndb/test/src/NDBT_Table.cpp: Auto merged storage/ndb/test/src/NDBT_Tables.cpp: Auto merged storage/ndb/test/src/NDBT_Test.cpp: Auto merged storage/ndb/test/src/NdbBackup.cpp: Auto merged storage/ndb/test/src/NdbConfig.cpp: Auto merged storage/ndb/test/src/NdbGrep.cpp: Auto merged storage/ndb/test/src/NdbRestarter.cpp: Auto merged storage/ndb/test/src/NdbRestarts.cpp: Auto merged storage/ndb/test/src/NdbSchemaCon.cpp: Auto merged storage/ndb/test/src/NdbSchemaOp.cpp: Auto merged storage/ndb/test/src/UtilTransactions.cpp: Auto merged storage/ndb/test/tools/copy_tab.cpp: Auto merged storage/ndb/test/tools/cpcc.cpp: Auto merged storage/ndb/test/tools/create_index.cpp: Auto merged storage/ndb/test/tools/hugoCalculator.cpp: Auto merged storage/ndb/test/tools/hugoFill.cpp: Auto merged storage/ndb/test/tools/hugoLoad.cpp: Auto merged storage/ndb/test/tools/hugoLockRecords.cpp: Auto merged storage/ndb/test/tools/hugoPkDelete.cpp: Auto merged storage/ndb/test/tools/hugoPkRead.cpp: Auto merged storage/ndb/test/tools/hugoPkReadRecord.cpp: Auto merged storage/ndb/test/tools/hugoPkUpdate.cpp: Auto merged storage/ndb/test/tools/hugoScanRead.cpp: Auto merged storage/ndb/test/tools/hugoScanUpdate.cpp: Auto merged storage/ndb/test/tools/restart.cpp: Auto merged storage/ndb/test/tools/transproxy.cpp: Auto merged storage/ndb/test/tools/verify_index.cpp: Auto merged storage/ndb/tools/delete_all.cpp: Auto merged storage/ndb/tools/desc.cpp: Auto merged storage/ndb/tools/drop_index.cpp: Auto merged storage/ndb/tools/drop_tab.cpp: Auto merged storage/ndb/tools/listTables.cpp: Auto merged storage/ndb/tools/ndb_condig.cpp: Auto merged storage/ndb/tools/ndb_test_platform.cpp: Auto merged storage/ndb/tools/ndbsql.cpp: Auto merged storage/ndb/tools/restore/Restore.cpp: Auto merged storage/ndb/tools/restore/Restore.hpp: Auto merged storage/ndb/tools/restore/consumer.cpp: Auto merged storage/ndb/tools/restore/consumer.hpp: Auto merged storage/ndb/tools/restore/consumer_printer.cpp: Auto merged storage/ndb/tools/restore/consumer_printer.hpp: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged storage/ndb/tools/restore/consumer_restore.hpp: Auto merged storage/ndb/tools/restore/consumer_restorem.cpp: Auto merged storage/ndb/tools/restore/restore_main.cpp: Auto merged storage/ndb/tools/select_all.cpp: Auto merged storage/ndb/tools/select_count.cpp: Auto merged storage/ndb/tools/waiter.cpp: Auto merged strings/Makefile.am: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-cp932.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-eucjpms.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-mb.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-ujis.c: Auto merged strings/ctype-utf8.c: Auto merged strings/ctype-win1250ch.c: Auto merged strings/ctype.c: Auto merged strings/decimal.c: Auto merged strings/strxnmov.c: Auto merged strings/xml.c: Auto merged tests/Makefile.am: Auto merged tests/mysql_client_test.c: Auto merged vio/Makefile.am: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged vio/viossl.c: Auto merged vio/viosslfactories.c: Auto merged zlib/Makefile.am: Auto merged
		
			
				
	
	
		
			1748 lines
		
	
	
		
			48 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			1748 lines
		
	
	
		
			48 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/* Copyright (C) 2000-2003 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 */
 | 
						|
 | 
						|
 | 
						|
/* create and drop of databases */
 | 
						|
 | 
						|
#include "mysql_priv.h"
 | 
						|
#include <mysys_err.h>
 | 
						|
#include "sp.h"
 | 
						|
#include "events.h"
 | 
						|
#include <my_dir.h>
 | 
						|
#include <m_ctype.h>
 | 
						|
#ifdef __WIN__
 | 
						|
#include <direct.h>
 | 
						|
#endif
 | 
						|
 | 
						|
#define MAX_DROP_TABLE_Q_LEN      1024
 | 
						|
 | 
						|
const char *del_exts[]= {".frm", ".BAK", ".TMD",".opt", NullS};
 | 
						|
static TYPELIB deletable_extentions=
 | 
						|
{array_elements(del_exts)-1,"del_exts", del_exts, NULL};
 | 
						|
 | 
						|
static long mysql_rm_known_files(THD *thd, MY_DIR *dirp,
 | 
						|
				 const char *db, const char *path, uint level, 
 | 
						|
                                 TABLE_LIST **dropped_tables);
 | 
						|
         
 | 
						|
static long mysql_rm_arc_files(THD *thd, MY_DIR *dirp, const char *org_path);
 | 
						|
static my_bool rm_dir_w_symlink(const char *org_path, my_bool send_error);
 | 
						|
 | 
						|
 | 
						|
/* Database lock hash */
 | 
						|
HASH lock_db_cache;
 | 
						|
pthread_mutex_t LOCK_lock_db;
 | 
						|
int creating_database= 0;  // how many database locks are made
 | 
						|
 | 
						|
 | 
						|
/* Structure for database lock */
 | 
						|
typedef struct my_dblock_st
 | 
						|
{
 | 
						|
  char *name;        /* Database name        */
 | 
						|
  uint name_length;  /* Database length name */
 | 
						|
} my_dblock_t;
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  lock_db key.
 | 
						|
*/
 | 
						|
 | 
						|
static byte* lock_db_get_key(my_dblock_t *ptr, uint *length,
 | 
						|
                             my_bool not_used __attribute__((unused)))
 | 
						|
{
 | 
						|
  *length= ptr->name_length;
 | 
						|
  return (byte*) ptr->name;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Free lock_db hash element.
 | 
						|
*/
 | 
						|
 | 
						|
static void lock_db_free_element(void *ptr)
 | 
						|
{
 | 
						|
  my_free((gptr) ptr, MYF(0));
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Put a database lock entry into the hash.
 | 
						|
  
 | 
						|
  DESCRIPTION
 | 
						|
    Insert a database lock entry into hash.
 | 
						|
    LOCK_db_lock must be previously locked.
 | 
						|
  
 | 
						|
  RETURN VALUES
 | 
						|
    0 on success.
 | 
						|
    1 on error.
 | 
						|
*/
 | 
						|
 | 
						|
static my_bool lock_db_insert(const char *dbname, uint length)
 | 
						|
{
 | 
						|
  my_dblock_t *opt;
 | 
						|
  my_bool error= 0;
 | 
						|
  DBUG_ENTER("lock_db_insert");
 | 
						|
  
 | 
						|
  safe_mutex_assert_owner(&LOCK_lock_db);
 | 
						|
 | 
						|
  if (!(opt= (my_dblock_t*) hash_search(&lock_db_cache,
 | 
						|
                                        (byte*) dbname, length)))
 | 
						|
  { 
 | 
						|
    /* Db is not in the hash, insert it */
 | 
						|
    char *tmp_name;
 | 
						|
    if (!my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
 | 
						|
                         &opt, (uint) sizeof(*opt), &tmp_name, length+1,
 | 
						|
                         NullS))
 | 
						|
    {
 | 
						|
      error= 1;
 | 
						|
      goto end;
 | 
						|
    }
 | 
						|
    
 | 
						|
    opt->name= tmp_name;
 | 
						|
    strmov(opt->name, dbname);
 | 
						|
    opt->name_length= length;
 | 
						|
    
 | 
						|
    if ((error= my_hash_insert(&lock_db_cache, (byte*) opt)))
 | 
						|
    {
 | 
						|
      my_free((gptr) opt, MYF(0));
 | 
						|
      goto end;
 | 
						|
    }
 | 
						|
  }
 | 
						|
 | 
						|
end:
 | 
						|
  DBUG_RETURN(error);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Delete a database lock entry from hash.
 | 
						|
*/
 | 
						|
 | 
						|
void lock_db_delete(const char *name, uint length)
 | 
						|
{
 | 
						|
  my_dblock_t *opt;
 | 
						|
  safe_mutex_assert_owner(&LOCK_lock_db);
 | 
						|
  if ((opt= (my_dblock_t *)hash_search(&lock_db_cache,
 | 
						|
                                       (const byte*) name, length)))
 | 
						|
    hash_delete(&lock_db_cache, (byte*) opt);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/* Database options hash */
 | 
						|
static HASH dboptions;
 | 
						|
static my_bool dboptions_init= 0;
 | 
						|
static rw_lock_t LOCK_dboptions;
 | 
						|
 | 
						|
/* Structure for database options */
 | 
						|
typedef struct my_dbopt_st
 | 
						|
{
 | 
						|
  char *name;			/* Database name                  */
 | 
						|
  uint name_length;		/* Database length name           */
 | 
						|
  CHARSET_INFO *charset;	/* Database default character set */
 | 
						|
} my_dbopt_t;
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Function we use in the creation of our hash to get key.
 | 
						|
*/
 | 
						|
 | 
						|
static byte* dboptions_get_key(my_dbopt_t *opt, uint *length,
 | 
						|
                               my_bool not_used __attribute__((unused)))
 | 
						|
{
 | 
						|
  *length= opt->name_length;
 | 
						|
  return (byte*) opt->name;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Helper function to write a query to binlog used by mysql_rm_db()
 | 
						|
*/
 | 
						|
 | 
						|
static inline void write_to_binlog(THD *thd, char *query, uint q_len,
 | 
						|
                                   char *db, uint db_len)
 | 
						|
{
 | 
						|
  Query_log_event qinfo(thd, query, q_len, 0, 0);
 | 
						|
  qinfo.error_code= 0;
 | 
						|
  qinfo.db= db;
 | 
						|
  qinfo.db_len= db_len;
 | 
						|
  mysql_bin_log.write(&qinfo);
 | 
						|
}  
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Function to free dboptions hash element
 | 
						|
*/
 | 
						|
 | 
						|
static void free_dbopt(void *dbopt)
 | 
						|
{
 | 
						|
  my_free((gptr) dbopt, MYF(0));
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/* 
 | 
						|
  Initialize database option hash and locked database hash.
 | 
						|
 | 
						|
  SYNOPSIS
 | 
						|
    my_database_names()
 | 
						|
 | 
						|
  NOTES
 | 
						|
    Must be called before any other database function is called.
 | 
						|
 | 
						|
  RETURN
 | 
						|
    0	ok
 | 
						|
    1	Fatal error
 | 
						|
*/
 | 
						|
 | 
						|
bool my_database_names_init(void)
 | 
						|
{
 | 
						|
  bool error= 0;
 | 
						|
  (void) my_rwlock_init(&LOCK_dboptions, NULL);
 | 
						|
  if (!dboptions_init)
 | 
						|
  {
 | 
						|
    dboptions_init= 1;
 | 
						|
    error= hash_init(&dboptions, lower_case_table_names ? 
 | 
						|
                     &my_charset_bin : system_charset_info,
 | 
						|
                     32, 0, 0, (hash_get_key) dboptions_get_key,
 | 
						|
                     free_dbopt,0) ||
 | 
						|
           hash_init(&lock_db_cache, lower_case_table_names ? 
 | 
						|
                     &my_charset_bin : system_charset_info,
 | 
						|
                     32, 0, 0, (hash_get_key) lock_db_get_key,
 | 
						|
                     lock_db_free_element,0);
 | 
						|
 | 
						|
  }
 | 
						|
  return error;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
 | 
						|
/* 
 | 
						|
  Free database option hash and locked databases hash.
 | 
						|
*/
 | 
						|
 | 
						|
void my_database_names_free(void)
 | 
						|
{
 | 
						|
  if (dboptions_init)
 | 
						|
  {
 | 
						|
    dboptions_init= 0;
 | 
						|
    hash_free(&dboptions);
 | 
						|
    (void) rwlock_destroy(&LOCK_dboptions);
 | 
						|
    hash_free(&lock_db_cache);
 | 
						|
  }
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Cleanup cached options
 | 
						|
*/
 | 
						|
 | 
						|
void my_dbopt_cleanup(void)
 | 
						|
{
 | 
						|
  rw_wrlock(&LOCK_dboptions);
 | 
						|
  hash_free(&dboptions);
 | 
						|
  hash_init(&dboptions, lower_case_table_names ? 
 | 
						|
            &my_charset_bin : system_charset_info,
 | 
						|
            32, 0, 0, (hash_get_key) dboptions_get_key,
 | 
						|
            free_dbopt,0);
 | 
						|
  rw_unlock(&LOCK_dboptions);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Find database options in the hash.
 | 
						|
  
 | 
						|
  DESCRIPTION
 | 
						|
    Search a database options in the hash, usings its path.
 | 
						|
    Fills "create" on success.
 | 
						|
  
 | 
						|
  RETURN VALUES
 | 
						|
    0 on success.
 | 
						|
    1 on error.
 | 
						|
*/
 | 
						|
 | 
						|
static my_bool get_dbopt(const char *dbname, HA_CREATE_INFO *create)
 | 
						|
{
 | 
						|
  my_dbopt_t *opt;
 | 
						|
  uint length;
 | 
						|
  my_bool error= 1;
 | 
						|
  
 | 
						|
  length= (uint) strlen(dbname);
 | 
						|
  
 | 
						|
  rw_rdlock(&LOCK_dboptions);
 | 
						|
  if ((opt= (my_dbopt_t*) hash_search(&dboptions, (byte*) dbname, length)))
 | 
						|
  {
 | 
						|
    create->default_table_charset= opt->charset;
 | 
						|
    error= 0;
 | 
						|
  }
 | 
						|
  rw_unlock(&LOCK_dboptions);
 | 
						|
  return error;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Writes database options into the hash.
 | 
						|
  
 | 
						|
  DESCRIPTION
 | 
						|
    Inserts database options into the hash, or updates
 | 
						|
    options if they are already in the hash.
 | 
						|
  
 | 
						|
  RETURN VALUES
 | 
						|
    0 on success.
 | 
						|
    1 on error.
 | 
						|
*/
 | 
						|
 | 
						|
static my_bool put_dbopt(const char *dbname, HA_CREATE_INFO *create)
 | 
						|
{
 | 
						|
  my_dbopt_t *opt;
 | 
						|
  uint length;
 | 
						|
  my_bool error= 0;
 | 
						|
  DBUG_ENTER("put_dbopt");
 | 
						|
 | 
						|
  length= (uint) strlen(dbname);
 | 
						|
  
 | 
						|
  rw_wrlock(&LOCK_dboptions);
 | 
						|
  if (!(opt= (my_dbopt_t*) hash_search(&dboptions, (byte*) dbname, length)))
 | 
						|
  { 
 | 
						|
    /* Options are not in the hash, insert them */
 | 
						|
    char *tmp_name;
 | 
						|
    if (!my_multi_malloc(MYF(MY_WME | MY_ZEROFILL),
 | 
						|
                         &opt, (uint) sizeof(*opt), &tmp_name, length+1,
 | 
						|
                         NullS))
 | 
						|
    {
 | 
						|
      error= 1;
 | 
						|
      goto end;
 | 
						|
    }
 | 
						|
    
 | 
						|
    opt->name= tmp_name;
 | 
						|
    strmov(opt->name, dbname);
 | 
						|
    opt->name_length= length;
 | 
						|
    
 | 
						|
    if ((error= my_hash_insert(&dboptions, (byte*) opt)))
 | 
						|
    {
 | 
						|
      my_free((gptr) opt, MYF(0));
 | 
						|
      goto end;
 | 
						|
    }
 | 
						|
  }
 | 
						|
 | 
						|
  /* Update / write options in hash */
 | 
						|
  opt->charset= create->default_table_charset;
 | 
						|
 | 
						|
end:
 | 
						|
  rw_unlock(&LOCK_dboptions);  
 | 
						|
  DBUG_RETURN(error);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Deletes database options from the hash.
 | 
						|
*/
 | 
						|
 | 
						|
void del_dbopt(const char *path)
 | 
						|
{
 | 
						|
  my_dbopt_t *opt;
 | 
						|
  rw_wrlock(&LOCK_dboptions);
 | 
						|
  if ((opt= (my_dbopt_t *)hash_search(&dboptions, (const byte*) path,
 | 
						|
                                      strlen(path))))
 | 
						|
    hash_delete(&dboptions, (byte*) opt);
 | 
						|
  rw_unlock(&LOCK_dboptions);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Create database options file:
 | 
						|
 | 
						|
  DESCRIPTION
 | 
						|
    Currently database default charset is only stored there.
 | 
						|
 | 
						|
  RETURN VALUES
 | 
						|
  0	ok
 | 
						|
  1	Could not create file or write to it.  Error sent through my_error()
 | 
						|
*/
 | 
						|
 | 
						|
static bool write_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create)
 | 
						|
{
 | 
						|
  register File file;
 | 
						|
  char buf[256]; // Should be enough for one option
 | 
						|
  bool error=1;
 | 
						|
 | 
						|
  if (!create->default_table_charset)
 | 
						|
    create->default_table_charset= thd->variables.collation_server;
 | 
						|
 | 
						|
  if (put_dbopt(path, create))
 | 
						|
    return 1;
 | 
						|
 | 
						|
  if ((file=my_create(path, CREATE_MODE,O_RDWR | O_TRUNC,MYF(MY_WME))) >= 0)
 | 
						|
  {
 | 
						|
    ulong length;
 | 
						|
    length= (ulong) (strxnmov(buf, sizeof(buf)-1, "default-character-set=",
 | 
						|
                              create->default_table_charset->csname,
 | 
						|
                              "\ndefault-collation=",
 | 
						|
                              create->default_table_charset->name,
 | 
						|
                              "\n", NullS) - buf);
 | 
						|
 | 
						|
    /* Error is written by my_write */
 | 
						|
    if (!my_write(file,(byte*) buf, length, MYF(MY_NABP+MY_WME)))
 | 
						|
      error=0;
 | 
						|
    my_close(file,MYF(0));
 | 
						|
  }
 | 
						|
  return error;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Load database options file
 | 
						|
 | 
						|
  load_db_opt()
 | 
						|
  path		Path for option file
 | 
						|
  create	Where to store the read options
 | 
						|
 | 
						|
  DESCRIPTION
 | 
						|
 | 
						|
  RETURN VALUES
 | 
						|
  0	File found
 | 
						|
  1	No database file or could not open it
 | 
						|
 | 
						|
*/
 | 
						|
 | 
						|
bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create)
 | 
						|
{
 | 
						|
  File file;
 | 
						|
  char buf[256];
 | 
						|
  DBUG_ENTER("load_db_opt");
 | 
						|
  bool error=1;
 | 
						|
  uint nbytes;
 | 
						|
 | 
						|
  bzero((char*) create,sizeof(*create));
 | 
						|
  create->default_table_charset= thd->variables.collation_server;
 | 
						|
 | 
						|
  /* Check if options for this database are already in the hash */
 | 
						|
  if (!get_dbopt(path, create))
 | 
						|
    DBUG_RETURN(0);
 | 
						|
 | 
						|
  /* Otherwise, load options from the .opt file */
 | 
						|
  if ((file=my_open(path, O_RDONLY | O_SHARE, MYF(0))) < 0)
 | 
						|
    goto err1;
 | 
						|
 | 
						|
  IO_CACHE cache;
 | 
						|
  if (init_io_cache(&cache, file, IO_SIZE, READ_CACHE, 0, 0, MYF(0)))
 | 
						|
    goto err2;
 | 
						|
 | 
						|
  while ((int) (nbytes= my_b_gets(&cache, (char*) buf, sizeof(buf))) > 0)
 | 
						|
  {
 | 
						|
    char *pos= buf+nbytes-1;
 | 
						|
    /* Remove end space and control characters */
 | 
						|
    while (pos > buf && !my_isgraph(&my_charset_latin1, pos[-1]))
 | 
						|
      pos--;
 | 
						|
    *pos=0;
 | 
						|
    if ((pos= strchr(buf, '=')))
 | 
						|
    {
 | 
						|
      if (!strncmp(buf,"default-character-set", (pos-buf)))
 | 
						|
      {
 | 
						|
        /*
 | 
						|
           Try character set name, and if it fails
 | 
						|
           try collation name, probably it's an old
 | 
						|
           4.1.0 db.opt file, which didn't have
 | 
						|
           separate default-character-set and
 | 
						|
           default-collation commands.
 | 
						|
        */
 | 
						|
        if (!(create->default_table_charset=
 | 
						|
        get_charset_by_csname(pos+1, MY_CS_PRIMARY, MYF(0))) &&
 | 
						|
            !(create->default_table_charset=
 | 
						|
              get_charset_by_name(pos+1, MYF(0))))
 | 
						|
        {
 | 
						|
          sql_print_error("Error while loading database options: '%s':",path);
 | 
						|
          sql_print_error(ER(ER_UNKNOWN_CHARACTER_SET),pos+1);
 | 
						|
          create->default_table_charset= default_charset_info;
 | 
						|
        }
 | 
						|
      }
 | 
						|
      else if (!strncmp(buf,"default-collation", (pos-buf)))
 | 
						|
      {
 | 
						|
        if (!(create->default_table_charset= get_charset_by_name(pos+1,
 | 
						|
                                                           MYF(0))))
 | 
						|
        {
 | 
						|
          sql_print_error("Error while loading database options: '%s':",path);
 | 
						|
          sql_print_error(ER(ER_UNKNOWN_COLLATION),pos+1);
 | 
						|
          create->default_table_charset= default_charset_info;
 | 
						|
        }
 | 
						|
      }
 | 
						|
    }
 | 
						|
  }
 | 
						|
  /*
 | 
						|
    Put the loaded value into the hash.
 | 
						|
    Note that another thread could've added the same
 | 
						|
    entry to the hash after we called get_dbopt(),
 | 
						|
    but it's not an error, as put_dbopt() takes this
 | 
						|
    possibility into account.
 | 
						|
  */
 | 
						|
  error= put_dbopt(path, create);
 | 
						|
 | 
						|
  end_io_cache(&cache);
 | 
						|
err2:
 | 
						|
  my_close(file,MYF(0));
 | 
						|
err1:
 | 
						|
  DBUG_RETURN(error);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Retrieve database options by name. Load database options file or fetch from
 | 
						|
  cache.
 | 
						|
 | 
						|
  SYNOPSIS
 | 
						|
    load_db_opt_by_name()
 | 
						|
    db_name         Database name
 | 
						|
    db_create_info  Where to store the database options
 | 
						|
 | 
						|
  DESCRIPTION
 | 
						|
    load_db_opt_by_name() is a shortcut for load_db_opt().
 | 
						|
 | 
						|
  NOTE
 | 
						|
    Although load_db_opt_by_name() (and load_db_opt()) returns status of
 | 
						|
    the operation, it is useless usually and should be ignored. The problem
 | 
						|
    is that there are 1) system databases ("mysql") and 2) virtual
 | 
						|
    databases ("information_schema"), which do not contain options file.
 | 
						|
    So, load_db_opt[_by_name]() returns FALSE for these databases, but this
 | 
						|
    is not an error.
 | 
						|
 | 
						|
    load_db_opt[_by_name]() clears db_create_info structure in any case, so
 | 
						|
    even on failure it contains valid data. So, common use case is just
 | 
						|
    call load_db_opt[_by_name]() without checking return value and use
 | 
						|
    db_create_info right after that.
 | 
						|
 | 
						|
  RETURN VALUES (read NOTE!)
 | 
						|
    FALSE   Success
 | 
						|
    TRUE    Failed to retrieve options
 | 
						|
*/
 | 
						|
 | 
						|
bool load_db_opt_by_name(THD *thd, const char *db_name,
 | 
						|
                         HA_CREATE_INFO *db_create_info)
 | 
						|
{
 | 
						|
  char db_opt_path[FN_REFLEN];
 | 
						|
 | 
						|
  /*
 | 
						|
    Pass an empty file name, and the database options file name as extension
 | 
						|
    to avoid table name to file name encoding.
 | 
						|
  */
 | 
						|
  (void) build_table_filename(db_opt_path, sizeof(db_opt_path),
 | 
						|
                              db_name, "", MY_DB_OPT_FILE, 0);
 | 
						|
 | 
						|
  return load_db_opt(thd, db_opt_path, db_create_info);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Create a database
 | 
						|
 | 
						|
  SYNOPSIS
 | 
						|
  mysql_create_db()
 | 
						|
  thd		Thread handler
 | 
						|
  db		Name of database to create
 | 
						|
		Function assumes that this is already validated.
 | 
						|
  create_info	Database create options (like character set)
 | 
						|
  silent	Used by replication when internally creating a database.
 | 
						|
		In this case the entry should not be logged.
 | 
						|
 | 
						|
  SIDE-EFFECTS
 | 
						|
   1. Report back to client that command succeeded (send_ok)
 | 
						|
   2. Report errors to client
 | 
						|
   3. Log event to binary log
 | 
						|
   (The 'silent' flags turns off 1 and 3.)
 | 
						|
 | 
						|
  RETURN VALUES
 | 
						|
  FALSE ok
 | 
						|
  TRUE  Error
 | 
						|
 | 
						|
*/
 | 
						|
 | 
						|
bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
 | 
						|
                     bool silent)
 | 
						|
{
 | 
						|
  char	 path[FN_REFLEN+16];
 | 
						|
  char	 tmp_query[FN_REFLEN+16];
 | 
						|
  long result= 1;
 | 
						|
  int error= 0;
 | 
						|
  MY_STAT stat_info;
 | 
						|
  uint create_options= create_info ? create_info->options : 0;
 | 
						|
  uint path_len;
 | 
						|
  DBUG_ENTER("mysql_create_db");
 | 
						|
 | 
						|
  /* do not create 'information_schema' db */
 | 
						|
  if (!my_strcasecmp(system_charset_info, db, information_schema_name.str))
 | 
						|
  {
 | 
						|
    my_error(ER_DB_CREATE_EXISTS, MYF(0), db);
 | 
						|
    DBUG_RETURN(-1);
 | 
						|
  }
 | 
						|
 | 
						|
  /*
 | 
						|
    Do not create database if another thread is holding read lock.
 | 
						|
    Wait for global read lock before acquiring LOCK_mysql_create_db.
 | 
						|
    After wait_if_global_read_lock() we have protection against another
 | 
						|
    global read lock. If we would acquire LOCK_mysql_create_db first,
 | 
						|
    another thread could step in and get the global read lock before we
 | 
						|
    reach wait_if_global_read_lock(). If this thread tries the same as we
 | 
						|
    (admin a db), it would then go and wait on LOCK_mysql_create_db...
 | 
						|
    Furthermore wait_if_global_read_lock() checks if the current thread
 | 
						|
    has the global read lock and refuses the operation with
 | 
						|
    ER_CANT_UPDATE_WITH_READLOCK if applicable.
 | 
						|
  */
 | 
						|
  if (wait_if_global_read_lock(thd, 0, 1))
 | 
						|
  {
 | 
						|
    error= -1;
 | 
						|
    goto exit2;
 | 
						|
  }
 | 
						|
 | 
						|
  VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
 | 
						|
 | 
						|
  /* Check directory */
 | 
						|
  path_len= build_table_filename(path, sizeof(path), db, "", "", 0);
 | 
						|
  path[path_len-1]= 0;                    // Remove last '/' from path
 | 
						|
 | 
						|
  if (my_stat(path,&stat_info,MYF(0)))
 | 
						|
  {
 | 
						|
    if (!(create_options & HA_LEX_CREATE_IF_NOT_EXISTS))
 | 
						|
    {
 | 
						|
      my_error(ER_DB_CREATE_EXISTS, MYF(0), db);
 | 
						|
      error= -1;
 | 
						|
      goto exit;
 | 
						|
    }
 | 
						|
    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 | 
						|
			ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db);
 | 
						|
    if (!silent)
 | 
						|
      send_ok(thd);
 | 
						|
    error= 0;
 | 
						|
    goto exit;
 | 
						|
  }
 | 
						|
  else
 | 
						|
  {
 | 
						|
    if (my_errno != ENOENT)
 | 
						|
    {
 | 
						|
      my_error(EE_STAT, MYF(0), path, my_errno);
 | 
						|
      goto exit;
 | 
						|
    }
 | 
						|
    if (my_mkdir(path,0777,MYF(0)) < 0)
 | 
						|
    {
 | 
						|
      my_error(ER_CANT_CREATE_DB, MYF(0), db, my_errno);
 | 
						|
      error= -1;
 | 
						|
      goto exit;
 | 
						|
    }
 | 
						|
  }
 | 
						|
 | 
						|
  path[path_len-1]= FN_LIBCHAR;
 | 
						|
  strmake(path+path_len, MY_DB_OPT_FILE, sizeof(path)-path_len-1);
 | 
						|
  if (write_db_opt(thd, path, create_info))
 | 
						|
  {
 | 
						|
    /*
 | 
						|
      Could not create options file.
 | 
						|
      Restore things to beginning.
 | 
						|
    */
 | 
						|
    path[path_len]= 0;
 | 
						|
    if (rmdir(path) >= 0)
 | 
						|
    {
 | 
						|
      error= -1;
 | 
						|
      goto exit;
 | 
						|
    }
 | 
						|
    /*
 | 
						|
      We come here when we managed to create the database, but not the option
 | 
						|
      file.  In this case it's best to just continue as if nothing has
 | 
						|
      happened.  (This is a very unlikely senario)
 | 
						|
    */
 | 
						|
  }
 | 
						|
  
 | 
						|
  if (!silent)
 | 
						|
  {
 | 
						|
    char *query;
 | 
						|
    uint query_length;
 | 
						|
 | 
						|
    if (!thd->query)				// Only in replication
 | 
						|
    {
 | 
						|
      query= 	     tmp_query;
 | 
						|
      query_length= (uint) (strxmov(tmp_query,"create database `",
 | 
						|
                                    db, "`", NullS) - tmp_query);
 | 
						|
    }
 | 
						|
    else
 | 
						|
    {
 | 
						|
      query= 	    thd->query;
 | 
						|
      query_length= thd->query_length;
 | 
						|
    }
 | 
						|
 | 
						|
    ha_binlog_log_query(thd, 0, LOGCOM_CREATE_DB,
 | 
						|
                        query, query_length,
 | 
						|
                        db, "");
 | 
						|
 | 
						|
    if (mysql_bin_log.is_open())
 | 
						|
    {
 | 
						|
      Query_log_event qinfo(thd, query, query_length, 0, 
 | 
						|
			    /* suppress_use */ TRUE);
 | 
						|
 | 
						|
      /*
 | 
						|
	Write should use the database being created as the "current
 | 
						|
        database" and not the threads current database, which is the
 | 
						|
        default. If we do not change the "current database" to the
 | 
						|
        database being created, the CREATE statement will not be
 | 
						|
        replicated when using --binlog-do-db to select databases to be
 | 
						|
        replicated. 
 | 
						|
 | 
						|
	An example (--binlog-do-db=sisyfos):
 | 
						|
       
 | 
						|
          CREATE DATABASE bob;        # Not replicated
 | 
						|
          USE bob;                    # 'bob' is the current database
 | 
						|
          CREATE DATABASE sisyfos;    # Not replicated since 'bob' is
 | 
						|
                                      # current database.
 | 
						|
          USE sisyfos;                # Will give error on slave since
 | 
						|
                                      # database does not exist.
 | 
						|
      */
 | 
						|
      qinfo.db     = db;
 | 
						|
      qinfo.db_len = strlen(db);
 | 
						|
 | 
						|
      /* These DDL methods and logging protected with LOCK_mysql_create_db */
 | 
						|
      mysql_bin_log.write(&qinfo);
 | 
						|
    }
 | 
						|
    send_ok(thd, result);
 | 
						|
  }
 | 
						|
 | 
						|
exit:
 | 
						|
  VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
 | 
						|
  start_waiting_global_read_lock(thd);
 | 
						|
exit2:
 | 
						|
  DBUG_RETURN(error);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/* db-name is already validated when we come here */
 | 
						|
 | 
						|
bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info)
 | 
						|
{
 | 
						|
  char path[FN_REFLEN+16];
 | 
						|
  long result=1;
 | 
						|
  int error= 0;
 | 
						|
  DBUG_ENTER("mysql_alter_db");
 | 
						|
 | 
						|
  /*
 | 
						|
    Do not alter database if another thread is holding read lock.
 | 
						|
    Wait for global read lock before acquiring LOCK_mysql_create_db.
 | 
						|
    After wait_if_global_read_lock() we have protection against another
 | 
						|
    global read lock. If we would acquire LOCK_mysql_create_db first,
 | 
						|
    another thread could step in and get the global read lock before we
 | 
						|
    reach wait_if_global_read_lock(). If this thread tries the same as we
 | 
						|
    (admin a db), it would then go and wait on LOCK_mysql_create_db...
 | 
						|
    Furthermore wait_if_global_read_lock() checks if the current thread
 | 
						|
    has the global read lock and refuses the operation with
 | 
						|
    ER_CANT_UPDATE_WITH_READLOCK if applicable.
 | 
						|
  */
 | 
						|
  if ((error=wait_if_global_read_lock(thd,0,1)))
 | 
						|
    goto exit2;
 | 
						|
 | 
						|
  VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
 | 
						|
 | 
						|
  /* 
 | 
						|
     Recreate db options file: /dbpath/.db.opt
 | 
						|
     We pass MY_DB_OPT_FILE as "extension" to avoid
 | 
						|
     "table name to file name" encoding.
 | 
						|
  */
 | 
						|
  build_table_filename(path, sizeof(path), db, "", MY_DB_OPT_FILE, 0);
 | 
						|
  if ((error=write_db_opt(thd, path, create_info)))
 | 
						|
    goto exit;
 | 
						|
 | 
						|
  /*
 | 
						|
     Change options if current database is being altered
 | 
						|
     TODO: Delete this code
 | 
						|
  */
 | 
						|
  if (thd->db && !strcmp(thd->db,db))
 | 
						|
  {
 | 
						|
    thd->db_charset= create_info->default_table_charset ?
 | 
						|
		     create_info->default_table_charset :
 | 
						|
		     thd->variables.collation_server;
 | 
						|
    thd->variables.collation_database= thd->db_charset;
 | 
						|
  }
 | 
						|
 | 
						|
  ha_binlog_log_query(thd, 0, LOGCOM_ALTER_DB,
 | 
						|
                      thd->query, thd->query_length,
 | 
						|
                      db, "");
 | 
						|
 | 
						|
  if (mysql_bin_log.is_open())
 | 
						|
  {
 | 
						|
    Query_log_event qinfo(thd, thd->query, thd->query_length, 0,
 | 
						|
			  /* suppress_use */ TRUE);
 | 
						|
 | 
						|
    /*
 | 
						|
      Write should use the database being created as the "current
 | 
						|
      database" and not the threads current database, which is the
 | 
						|
      default.
 | 
						|
    */
 | 
						|
    qinfo.db     = db;
 | 
						|
    qinfo.db_len = strlen(db);
 | 
						|
 | 
						|
    thd->clear_error();
 | 
						|
    /* These DDL methods and logging protected with LOCK_mysql_create_db */
 | 
						|
    mysql_bin_log.write(&qinfo);
 | 
						|
  }
 | 
						|
  send_ok(thd, result);
 | 
						|
 | 
						|
exit:
 | 
						|
  VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
 | 
						|
  start_waiting_global_read_lock(thd);
 | 
						|
exit2:
 | 
						|
  DBUG_RETURN(error);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Drop all tables in a database and the database itself
 | 
						|
 | 
						|
  SYNOPSIS
 | 
						|
    mysql_rm_db()
 | 
						|
    thd			Thread handle
 | 
						|
    db			Database name in the case given by user
 | 
						|
		        It's already validated and set to lower case
 | 
						|
                        (if needed) when we come here
 | 
						|
    if_exists		Don't give error if database doesn't exists
 | 
						|
    silent		Don't generate errors
 | 
						|
 | 
						|
  RETURN
 | 
						|
    FALSE ok (Database dropped)
 | 
						|
    ERROR Error
 | 
						|
*/
 | 
						|
 | 
						|
bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
 | 
						|
{
 | 
						|
  long deleted=0;
 | 
						|
  int error= 0;
 | 
						|
  char	path[FN_REFLEN+16];
 | 
						|
  MY_DIR *dirp;
 | 
						|
  uint length;
 | 
						|
  TABLE_LIST* dropped_tables= 0;
 | 
						|
  DBUG_ENTER("mysql_rm_db");
 | 
						|
 | 
						|
  /*
 | 
						|
    Do not drop database if another thread is holding read lock.
 | 
						|
    Wait for global read lock before acquiring LOCK_mysql_create_db.
 | 
						|
    After wait_if_global_read_lock() we have protection against another
 | 
						|
    global read lock. If we would acquire LOCK_mysql_create_db first,
 | 
						|
    another thread could step in and get the global read lock before we
 | 
						|
    reach wait_if_global_read_lock(). If this thread tries the same as we
 | 
						|
    (admin a db), it would then go and wait on LOCK_mysql_create_db...
 | 
						|
    Furthermore wait_if_global_read_lock() checks if the current thread
 | 
						|
    has the global read lock and refuses the operation with
 | 
						|
    ER_CANT_UPDATE_WITH_READLOCK if applicable.
 | 
						|
  */
 | 
						|
  if (wait_if_global_read_lock(thd, 0, 1))
 | 
						|
  {
 | 
						|
    error= -1;
 | 
						|
    goto exit2;
 | 
						|
  }
 | 
						|
 | 
						|
  VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
 | 
						|
 | 
						|
  length= build_table_filename(path, sizeof(path), db, "", "", 0);
 | 
						|
  strmov(path+length, MY_DB_OPT_FILE);		// Append db option file name
 | 
						|
  del_dbopt(path);				// Remove dboption hash entry
 | 
						|
  path[length]= '\0';				// Remove file name
 | 
						|
 | 
						|
  /* See if the directory exists */
 | 
						|
  if (!(dirp= my_dir(path,MYF(MY_DONT_SORT))))
 | 
						|
  {
 | 
						|
    if (!if_exists)
 | 
						|
    {
 | 
						|
      error= -1;
 | 
						|
      my_error(ER_DB_DROP_EXISTS, MYF(0), db);
 | 
						|
      goto exit;
 | 
						|
    }
 | 
						|
    else
 | 
						|
      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
 | 
						|
			  ER_DB_DROP_EXISTS, ER(ER_DB_DROP_EXISTS), db);
 | 
						|
  }
 | 
						|
  else
 | 
						|
  {
 | 
						|
    pthread_mutex_lock(&LOCK_open);
 | 
						|
    remove_db_from_cache(db);
 | 
						|
    pthread_mutex_unlock(&LOCK_open);
 | 
						|
 | 
						|
    
 | 
						|
    error= -1;
 | 
						|
    if ((deleted= mysql_rm_known_files(thd, dirp, db, path, 0,
 | 
						|
                                       &dropped_tables)) >= 0)
 | 
						|
    {
 | 
						|
      ha_drop_database(path);
 | 
						|
      query_cache_invalidate1(db);
 | 
						|
      error = 0;
 | 
						|
    }
 | 
						|
  }
 | 
						|
  if (!silent && deleted>=0)
 | 
						|
  {
 | 
						|
    const char *query;
 | 
						|
    ulong query_length;
 | 
						|
    if (!thd->query)
 | 
						|
    {
 | 
						|
      /* The client used the old obsolete mysql_drop_db() call */
 | 
						|
      query= path;
 | 
						|
      query_length= (uint) (strxmov(path, "drop database `", db, "`",
 | 
						|
                                     NullS) - path);
 | 
						|
    }
 | 
						|
    else
 | 
						|
    {
 | 
						|
      query =thd->query;
 | 
						|
      query_length= thd->query_length;
 | 
						|
    }
 | 
						|
    if (mysql_bin_log.is_open())
 | 
						|
    {
 | 
						|
      Query_log_event qinfo(thd, query, query_length, 0, 
 | 
						|
			    /* suppress_use */ TRUE);
 | 
						|
      /*
 | 
						|
        Write should use the database being created as the "current
 | 
						|
        database" and not the threads current database, which is the
 | 
						|
        default.
 | 
						|
      */
 | 
						|
      qinfo.db     = db;
 | 
						|
      qinfo.db_len = strlen(db);
 | 
						|
 | 
						|
      thd->clear_error();
 | 
						|
      /* These DDL methods and logging protected with LOCK_mysql_create_db */
 | 
						|
      mysql_bin_log.write(&qinfo);
 | 
						|
    }
 | 
						|
    thd->server_status|= SERVER_STATUS_DB_DROPPED;
 | 
						|
    send_ok(thd, (ulong) deleted);
 | 
						|
    thd->server_status&= ~SERVER_STATUS_DB_DROPPED;
 | 
						|
  }
 | 
						|
  else if (mysql_bin_log.is_open())
 | 
						|
  {
 | 
						|
    char *query, *query_pos, *query_end, *query_data_start;
 | 
						|
    TABLE_LIST *tbl;
 | 
						|
    uint db_len;
 | 
						|
 | 
						|
    if (!(query= thd->alloc(MAX_DROP_TABLE_Q_LEN)))
 | 
						|
      goto exit; /* not much else we can do */
 | 
						|
    query_pos= query_data_start= strmov(query,"drop table ");
 | 
						|
    query_end= query + MAX_DROP_TABLE_Q_LEN;
 | 
						|
    db_len= strlen(db);
 | 
						|
 | 
						|
    for (tbl= dropped_tables; tbl; tbl= tbl->next_local)
 | 
						|
    {
 | 
						|
      uint tbl_name_len;
 | 
						|
 | 
						|
      /* 3 for the quotes and the comma*/
 | 
						|
      tbl_name_len= strlen(tbl->table_name) + 3;
 | 
						|
      if (query_pos + tbl_name_len + 1 >= query_end)
 | 
						|
      {
 | 
						|
        /* These DDL methods and logging protected with LOCK_mysql_create_db */
 | 
						|
        write_to_binlog(thd, query, query_pos -1 - query, db, db_len);
 | 
						|
        query_pos= query_data_start;
 | 
						|
      }
 | 
						|
 | 
						|
      *query_pos++ = '`';
 | 
						|
      query_pos= strmov(query_pos,tbl->table_name);
 | 
						|
      *query_pos++ = '`';
 | 
						|
      *query_pos++ = ',';
 | 
						|
    }
 | 
						|
 | 
						|
    if (query_pos != query_data_start)
 | 
						|
    {
 | 
						|
      /* These DDL methods and logging protected with LOCK_mysql_create_db */
 | 
						|
      write_to_binlog(thd, query, query_pos -1 - query, db, db_len);
 | 
						|
    }
 | 
						|
  }
 | 
						|
 | 
						|
exit:
 | 
						|
  (void)sp_drop_db_routines(thd, db); /* QQ Ignore errors for now  */
 | 
						|
  Events::get_instance()->drop_schema_events(thd, db);
 | 
						|
  /*
 | 
						|
    If this database was the client's selected database, we silently
 | 
						|
    change the client's selected database to nothing (to have an empty
 | 
						|
    SELECT DATABASE() in the future). For this we free() thd->db and set
 | 
						|
    it to 0.
 | 
						|
  */
 | 
						|
  if (thd->db && !strcmp(thd->db, db))
 | 
						|
    thd->set_db(NULL, 0);
 | 
						|
  VOID(pthread_mutex_unlock(&LOCK_mysql_create_db));
 | 
						|
  start_waiting_global_read_lock(thd);
 | 
						|
exit2:
 | 
						|
  DBUG_RETURN(error);
 | 
						|
}
 | 
						|
 | 
						|
/*
 | 
						|
  Removes files with known extensions plus all found subdirectories that
 | 
						|
  are 2 hex digits (raid directories).
 | 
						|
  thd MUST be set when calling this function!
 | 
						|
*/
 | 
						|
 | 
						|
static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
 | 
						|
				 const char *org_path, uint level,
 | 
						|
                                 TABLE_LIST **dropped_tables)
 | 
						|
{
 | 
						|
  long deleted=0;
 | 
						|
  ulong found_other_files=0;
 | 
						|
  char filePath[FN_REFLEN];
 | 
						|
  TABLE_LIST *tot_list=0, **tot_list_next;
 | 
						|
  List<String> raid_dirs;
 | 
						|
  DBUG_ENTER("mysql_rm_known_files");
 | 
						|
  DBUG_PRINT("enter",("path: %s", org_path));
 | 
						|
 | 
						|
  tot_list_next= &tot_list;
 | 
						|
 | 
						|
  for (uint idx=0 ;
 | 
						|
       idx < (uint) dirp->number_off_files && !thd->killed ;
 | 
						|
       idx++)
 | 
						|
  {
 | 
						|
    FILEINFO *file=dirp->dir_entry+idx;
 | 
						|
    char *extension;
 | 
						|
    DBUG_PRINT("info",("Examining: %s", file->name));
 | 
						|
 | 
						|
    /* skiping . and .. */
 | 
						|
    if (file->name[0] == '.' && (!file->name[1] ||
 | 
						|
       (file->name[1] == '.' &&  !file->name[2])))
 | 
						|
      continue;
 | 
						|
 | 
						|
    /* Check if file is a raid directory */
 | 
						|
    if ((my_isdigit(system_charset_info, file->name[0]) ||
 | 
						|
	 (file->name[0] >= 'a' && file->name[0] <= 'f')) &&
 | 
						|
	(my_isdigit(system_charset_info, file->name[1]) ||
 | 
						|
	 (file->name[1] >= 'a' && file->name[1] <= 'f')) &&
 | 
						|
	!file->name[2] && !level)
 | 
						|
    {
 | 
						|
      char newpath[FN_REFLEN], *copy_of_path;
 | 
						|
      MY_DIR *new_dirp;
 | 
						|
      String *dir;
 | 
						|
      uint length;
 | 
						|
 | 
						|
      strxmov(newpath,org_path,"/",file->name,NullS);
 | 
						|
      length= unpack_filename(newpath,newpath);
 | 
						|
      if ((new_dirp = my_dir(newpath,MYF(MY_DONT_SORT))))
 | 
						|
      {
 | 
						|
	DBUG_PRINT("my",("New subdir found: %s", newpath));
 | 
						|
	if ((mysql_rm_known_files(thd, new_dirp, NullS, newpath,1,0)) < 0)
 | 
						|
	  goto err;
 | 
						|
	if (!(copy_of_path= thd->memdup(newpath, length+1)) ||
 | 
						|
	    !(dir= new (thd->mem_root) String(copy_of_path, length,
 | 
						|
					       &my_charset_bin)) ||
 | 
						|
	    raid_dirs.push_back(dir))
 | 
						|
	  goto err;
 | 
						|
	continue;
 | 
						|
      }
 | 
						|
      found_other_files++;
 | 
						|
      continue;
 | 
						|
    }
 | 
						|
    else if (file->name[0] == 'a' && file->name[1] == 'r' &&
 | 
						|
             file->name[2] == 'c' && file->name[3] == '\0')
 | 
						|
    {
 | 
						|
      /* .frm archive */
 | 
						|
      char newpath[FN_REFLEN];
 | 
						|
      MY_DIR *new_dirp;
 | 
						|
      strxmov(newpath, org_path, "/", "arc", NullS);
 | 
						|
      (void) unpack_filename(newpath, newpath);
 | 
						|
      if ((new_dirp = my_dir(newpath, MYF(MY_DONT_SORT))))
 | 
						|
      {
 | 
						|
	DBUG_PRINT("my",("Archive subdir found: %s", newpath));
 | 
						|
	if ((mysql_rm_arc_files(thd, new_dirp, newpath)) < 0)
 | 
						|
	  goto err;
 | 
						|
	continue;
 | 
						|
      }
 | 
						|
      found_other_files++;
 | 
						|
      continue;
 | 
						|
    }
 | 
						|
    if (!(extension= strrchr(file->name, '.')))
 | 
						|
      extension= strend(file->name);
 | 
						|
    if (find_type(extension, &deletable_extentions,1+2) <= 0)
 | 
						|
    {
 | 
						|
      if (find_type(extension, ha_known_exts(),1+2) <= 0)
 | 
						|
	found_other_files++;
 | 
						|
      continue;
 | 
						|
    }
 | 
						|
    /* just for safety we use files_charset_info */
 | 
						|
    if (db && !my_strcasecmp(files_charset_info,
 | 
						|
                             extension, reg_ext))
 | 
						|
    {
 | 
						|
      /* Drop the table nicely */
 | 
						|
      *extension= 0;			// Remove extension
 | 
						|
      TABLE_LIST *table_list=(TABLE_LIST*)
 | 
						|
	thd->calloc(sizeof(*table_list)+ strlen(db)+strlen(file->name)+2);
 | 
						|
      if (!table_list)
 | 
						|
	goto err;
 | 
						|
      table_list->db= (char*) (table_list+1);
 | 
						|
      table_list->table_name= strmov(table_list->db, db) + 1;
 | 
						|
      VOID(filename_to_tablename(file->name, table_list->table_name,
 | 
						|
                                 strlen(file->name) + 1));
 | 
						|
      table_list->alias= table_list->table_name;	// If lower_case_table_names=2
 | 
						|
      /* Link into list */
 | 
						|
      (*tot_list_next)= table_list;
 | 
						|
      tot_list_next= &table_list->next_local;
 | 
						|
      deleted++;
 | 
						|
    }
 | 
						|
    else
 | 
						|
    {
 | 
						|
      strxmov(filePath, org_path, "/", file->name, NullS);
 | 
						|
      if (my_delete_with_symlink(filePath,MYF(MY_WME)))
 | 
						|
      {
 | 
						|
	goto err;
 | 
						|
      }
 | 
						|
    }
 | 
						|
  }
 | 
						|
  if (thd->killed ||
 | 
						|
      (tot_list && mysql_rm_table_part2_with_lock(thd, tot_list, 1, 0, 1)))
 | 
						|
    goto err;
 | 
						|
 | 
						|
  /* Remove RAID directories */
 | 
						|
  {
 | 
						|
    List_iterator<String> it(raid_dirs);
 | 
						|
    String *dir;
 | 
						|
    while ((dir= it++))
 | 
						|
      if (rmdir(dir->c_ptr()) < 0)
 | 
						|
	found_other_files++;
 | 
						|
  }
 | 
						|
  my_dirend(dirp);  
 | 
						|
  
 | 
						|
  if (dropped_tables)
 | 
						|
    *dropped_tables= tot_list;
 | 
						|
  
 | 
						|
  /*
 | 
						|
    If the directory is a symbolic link, remove the link first, then
 | 
						|
    remove the directory the symbolic link pointed at
 | 
						|
  */
 | 
						|
  if (found_other_files)
 | 
						|
  {
 | 
						|
    my_error(ER_DB_DROP_RMDIR, MYF(0), org_path, EEXIST);
 | 
						|
    DBUG_RETURN(-1);
 | 
						|
  }
 | 
						|
  else
 | 
						|
  {
 | 
						|
    /* Don't give errors if we can't delete 'RAID' directory */
 | 
						|
    if (rm_dir_w_symlink(org_path, level == 0))
 | 
						|
      DBUG_RETURN(-1);
 | 
						|
  }
 | 
						|
 | 
						|
  DBUG_RETURN(deleted);
 | 
						|
 | 
						|
err:
 | 
						|
  my_dirend(dirp);
 | 
						|
  DBUG_RETURN(-1);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Remove directory with symlink
 | 
						|
 | 
						|
  SYNOPSIS
 | 
						|
    rm_dir_w_symlink()
 | 
						|
    org_path    path of derictory
 | 
						|
    send_error  send errors
 | 
						|
  RETURN
 | 
						|
    0 OK
 | 
						|
    1 ERROR
 | 
						|
*/
 | 
						|
 | 
						|
static my_bool rm_dir_w_symlink(const char *org_path, my_bool send_error)
 | 
						|
{
 | 
						|
  char tmp_path[FN_REFLEN], *pos;
 | 
						|
  char *path= tmp_path;
 | 
						|
  DBUG_ENTER("rm_dir_w_symlink");
 | 
						|
  unpack_filename(tmp_path, org_path);
 | 
						|
#ifdef HAVE_READLINK
 | 
						|
  int error;
 | 
						|
  char tmp2_path[FN_REFLEN];
 | 
						|
 | 
						|
  /* Remove end FN_LIBCHAR as this causes problem on Linux in readlink */
 | 
						|
  pos= strend(path);
 | 
						|
  if (pos > path && pos[-1] == FN_LIBCHAR)
 | 
						|
    *--pos=0;
 | 
						|
 | 
						|
  if ((error= my_readlink(tmp2_path, path, MYF(MY_WME))) < 0)
 | 
						|
    DBUG_RETURN(1);
 | 
						|
  if (!error)
 | 
						|
  {
 | 
						|
    if (my_delete(path, MYF(send_error ? MY_WME : 0)))
 | 
						|
    {
 | 
						|
      DBUG_RETURN(send_error);
 | 
						|
    }
 | 
						|
    /* Delete directory symbolic link pointed at */
 | 
						|
    path= tmp2_path;
 | 
						|
  }
 | 
						|
#endif
 | 
						|
  /* Remove last FN_LIBCHAR to not cause a problem on OS/2 */
 | 
						|
  pos= strend(path);
 | 
						|
 | 
						|
  if (pos > path && pos[-1] == FN_LIBCHAR)
 | 
						|
    *--pos=0;
 | 
						|
  if (rmdir(path) < 0 && send_error)
 | 
						|
  {
 | 
						|
    my_error(ER_DB_DROP_RMDIR, MYF(0), path, errno);
 | 
						|
    DBUG_RETURN(1);
 | 
						|
  }
 | 
						|
  DBUG_RETURN(0);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Remove .frm archives from directory
 | 
						|
 | 
						|
  SYNOPSIS
 | 
						|
    thd       thread handler
 | 
						|
    dirp      list of files in archive directory
 | 
						|
    db        data base name
 | 
						|
    org_path  path of archive directory
 | 
						|
 | 
						|
  RETURN
 | 
						|
    > 0 number of removed files
 | 
						|
    -1  error
 | 
						|
*/
 | 
						|
static long mysql_rm_arc_files(THD *thd, MY_DIR *dirp,
 | 
						|
				 const char *org_path)
 | 
						|
{
 | 
						|
  long deleted= 0;
 | 
						|
  ulong found_other_files= 0;
 | 
						|
  char filePath[FN_REFLEN];
 | 
						|
  DBUG_ENTER("mysql_rm_arc_files");
 | 
						|
  DBUG_PRINT("enter", ("path: %s", org_path));
 | 
						|
 | 
						|
  for (uint idx=0 ;
 | 
						|
       idx < (uint) dirp->number_off_files && !thd->killed ;
 | 
						|
       idx++)
 | 
						|
  {
 | 
						|
    FILEINFO *file=dirp->dir_entry+idx;
 | 
						|
    char *extension, *revision;
 | 
						|
    DBUG_PRINT("info",("Examining: %s", file->name));
 | 
						|
 | 
						|
    /* skiping . and .. */
 | 
						|
    if (file->name[0] == '.' && (!file->name[1] ||
 | 
						|
       (file->name[1] == '.' &&  !file->name[2])))
 | 
						|
      continue;
 | 
						|
 | 
						|
    extension= fn_ext(file->name);
 | 
						|
    if (extension[0] != '.' ||
 | 
						|
        extension[1] != 'f' || extension[2] != 'r' ||
 | 
						|
        extension[3] != 'm' || extension[4] != '-')
 | 
						|
    {
 | 
						|
      found_other_files++;
 | 
						|
      continue;
 | 
						|
    }
 | 
						|
    revision= extension+5;
 | 
						|
    while (*revision && my_isdigit(system_charset_info, *revision))
 | 
						|
      revision++;
 | 
						|
    if (*revision)
 | 
						|
    {
 | 
						|
      found_other_files++;
 | 
						|
      continue;
 | 
						|
    }
 | 
						|
    strxmov(filePath, org_path, "/", file->name, NullS);
 | 
						|
    if (my_delete_with_symlink(filePath,MYF(MY_WME)))
 | 
						|
    {
 | 
						|
      goto err;
 | 
						|
    }
 | 
						|
  }
 | 
						|
  if (thd->killed)
 | 
						|
    goto err;
 | 
						|
 | 
						|
  my_dirend(dirp);
 | 
						|
 | 
						|
  /*
 | 
						|
    If the directory is a symbolic link, remove the link first, then
 | 
						|
    remove the directory the symbolic link pointed at
 | 
						|
  */
 | 
						|
  if (!found_other_files &&
 | 
						|
      rm_dir_w_symlink(org_path, 0))
 | 
						|
    DBUG_RETURN(-1);
 | 
						|
  DBUG_RETURN(deleted);
 | 
						|
 | 
						|
err:
 | 
						|
  my_dirend(dirp);
 | 
						|
  DBUG_RETURN(-1);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Change the current database.
 | 
						|
 | 
						|
  SYNOPSIS
 | 
						|
    mysql_change_db()
 | 
						|
    thd			thread handle
 | 
						|
    name		database name
 | 
						|
    no_access_check	if TRUE, don't do access check. In this
 | 
						|
                        case name may be ""
 | 
						|
 | 
						|
  DESCRIPTION
 | 
						|
    Check that the database name corresponds to a valid and
 | 
						|
    existent database, check access rights (unless called with
 | 
						|
    no_access_check), and set the current database. This function
 | 
						|
    is called to change the current database upon user request
 | 
						|
    (COM_CHANGE_DB command) or temporarily, to execute a stored
 | 
						|
    routine.
 | 
						|
 | 
						|
  NOTES
 | 
						|
    This function is not the only way to switch the database that
 | 
						|
    is currently employed. When the replication slave thread
 | 
						|
    switches the database before executing a query, it calls
 | 
						|
    thd->set_db directly. However, if the query, in turn, uses
 | 
						|
    a stored routine, the stored routine will use this function,
 | 
						|
    even if it's run on the slave.
 | 
						|
 | 
						|
    This function allocates the name of the database on the system
 | 
						|
    heap: this is necessary to be able to uniformly change the
 | 
						|
    database from any module of the server. Up to 5.0 different
 | 
						|
    modules were using different memory to store the name of the
 | 
						|
    database, and this led to memory corruption: a stack pointer
 | 
						|
    set by Stored Procedures was used by replication after the
 | 
						|
    stack address was long gone.
 | 
						|
 | 
						|
    This function does not send anything, including error
 | 
						|
    messages, to the client. If that should be sent to the client,
 | 
						|
    call net_send_error after this function.
 | 
						|
 | 
						|
  RETURN VALUES
 | 
						|
    0	OK
 | 
						|
    1	error
 | 
						|
*/
 | 
						|
 | 
						|
bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
 | 
						|
{
 | 
						|
  LEX_STRING db_name;
 | 
						|
  bool system_db= 0;
 | 
						|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
 | 
						|
  ulong db_access;
 | 
						|
  Security_context *sctx= thd->security_ctx;
 | 
						|
  LINT_INIT(db_access);
 | 
						|
#endif
 | 
						|
  DBUG_ENTER("mysql_change_db");
 | 
						|
  DBUG_PRINT("enter",("name: '%s'",name));
 | 
						|
 | 
						|
  if (name == NULL || name[0] == '\0' && no_access_check == FALSE)
 | 
						|
  {
 | 
						|
    my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));
 | 
						|
    DBUG_RETURN(1);				/* purecov: inspected */
 | 
						|
  }
 | 
						|
  else if (name[0] == '\0')
 | 
						|
  {
 | 
						|
    /* Called from SP to restore the original database, which was NULL */
 | 
						|
    DBUG_ASSERT(no_access_check);
 | 
						|
    system_db= 1;
 | 
						|
    db_name.str= NULL;
 | 
						|
    db_name.length= 0;
 | 
						|
    goto end;
 | 
						|
  }
 | 
						|
  /*
 | 
						|
    Now we need to make a copy because check_db_name requires a
 | 
						|
    non-constant argument. TODO: fix check_db_name.
 | 
						|
  */
 | 
						|
  if ((db_name.str= my_strdup(name, MYF(MY_WME))) == NULL)
 | 
						|
    DBUG_RETURN(1);                             /* the error is set */
 | 
						|
  db_name.length= strlen(db_name.str);
 | 
						|
  if (check_db_name(&db_name))
 | 
						|
  {
 | 
						|
    my_error(ER_WRONG_DB_NAME, MYF(0), db_name.str);
 | 
						|
    my_free(db_name.str, MYF(0));
 | 
						|
    DBUG_RETURN(1);
 | 
						|
  }
 | 
						|
  DBUG_PRINT("info",("Use database: %s", db_name.str));
 | 
						|
  if (!my_strcasecmp(system_charset_info, db_name.str,
 | 
						|
                     information_schema_name.str))
 | 
						|
  {
 | 
						|
    system_db= 1;
 | 
						|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
 | 
						|
    db_access= SELECT_ACL;
 | 
						|
#endif
 | 
						|
    goto end;
 | 
						|
  }
 | 
						|
 | 
						|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
 | 
						|
  if (!no_access_check)
 | 
						|
  {
 | 
						|
    if (test_all_bits(sctx->master_access, DB_ACLS))
 | 
						|
      db_access=DB_ACLS;
 | 
						|
    else
 | 
						|
      db_access= (acl_get(sctx->host, sctx->ip, sctx->priv_user,
 | 
						|
                          db_name.str, 0) |
 | 
						|
                  sctx->master_access);
 | 
						|
    if (!(db_access & DB_ACLS) && (!grant_option ||
 | 
						|
                                   check_grant_db(thd, db_name.str)))
 | 
						|
    {
 | 
						|
      my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
 | 
						|
               sctx->priv_user,
 | 
						|
               sctx->priv_host,
 | 
						|
               db_name.str);
 | 
						|
      general_log_print(thd, COM_INIT_DB, ER(ER_DBACCESS_DENIED_ERROR),
 | 
						|
                        sctx->priv_user, sctx->priv_host, db_name.str);
 | 
						|
      my_free(db_name.str, MYF(0));
 | 
						|
      DBUG_RETURN(1);
 | 
						|
    }
 | 
						|
  }
 | 
						|
#endif
 | 
						|
 | 
						|
  if (check_db_dir_existence(db_name.str))
 | 
						|
  {
 | 
						|
    my_error(ER_BAD_DB_ERROR, MYF(0), db_name.str);
 | 
						|
    my_free(db_name.str, MYF(0));
 | 
						|
    DBUG_RETURN(1);
 | 
						|
  }
 | 
						|
 | 
						|
end:
 | 
						|
  x_free(thd->db);
 | 
						|
  DBUG_ASSERT(db_name.str == NULL || db_name.str[0] != '\0');
 | 
						|
  thd->reset_db(db_name.str, db_name.length);   // THD::~THD will free this
 | 
						|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
 | 
						|
  if (!no_access_check)
 | 
						|
    sctx->db_access= db_access;
 | 
						|
#endif
 | 
						|
  if (system_db)
 | 
						|
  {
 | 
						|
    thd->db_charset= system_charset_info;
 | 
						|
    thd->variables.collation_database= system_charset_info;
 | 
						|
  }
 | 
						|
  else
 | 
						|
  {
 | 
						|
    HA_CREATE_INFO create;
 | 
						|
 | 
						|
    load_db_opt_by_name(thd, db_name.str, &create);
 | 
						|
 | 
						|
    thd->db_charset= create.default_table_charset ?
 | 
						|
      create.default_table_charset :
 | 
						|
      thd->variables.collation_server;
 | 
						|
    thd->variables.collation_database= thd->db_charset;
 | 
						|
  }
 | 
						|
  DBUG_RETURN(0);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
static int
 | 
						|
lock_databases(THD *thd, const char *db1, uint length1,
 | 
						|
                         const char *db2, uint length2)
 | 
						|
{
 | 
						|
  pthread_mutex_lock(&LOCK_lock_db);
 | 
						|
  while (!thd->killed &&
 | 
						|
         (hash_search(&lock_db_cache,(byte*) db1, length1) ||
 | 
						|
          hash_search(&lock_db_cache,(byte*) db2, length2)))
 | 
						|
  {
 | 
						|
    wait_for_condition(thd, &LOCK_lock_db, &COND_refresh);
 | 
						|
    pthread_mutex_lock(&LOCK_lock_db);
 | 
						|
  }
 | 
						|
 | 
						|
  if (thd->killed)
 | 
						|
  {
 | 
						|
    pthread_mutex_unlock(&LOCK_lock_db);
 | 
						|
    return 1;
 | 
						|
  }
 | 
						|
 | 
						|
  lock_db_insert(db1, length1);
 | 
						|
  lock_db_insert(db2, length2);
 | 
						|
  creating_database++;
 | 
						|
 | 
						|
  /*
 | 
						|
    Wait if a concurent thread is creating a table at the same time.
 | 
						|
    The assumption here is that it will not take too long until
 | 
						|
    there is a point in time when a table is not created.
 | 
						|
  */
 | 
						|
 | 
						|
  while (!thd->killed && creating_table)
 | 
						|
  {
 | 
						|
    wait_for_condition(thd, &LOCK_lock_db, &COND_refresh);
 | 
						|
    pthread_mutex_lock(&LOCK_lock_db);
 | 
						|
  }
 | 
						|
 | 
						|
  if (thd->killed)
 | 
						|
  {
 | 
						|
    lock_db_delete(db1, length1);
 | 
						|
    lock_db_delete(db2, length2);
 | 
						|
    creating_database--;
 | 
						|
    pthread_mutex_unlock(&LOCK_lock_db);
 | 
						|
    pthread_cond_signal(&COND_refresh);
 | 
						|
    return(1);
 | 
						|
  }
 | 
						|
 | 
						|
  /*
 | 
						|
    We can unlock now as the hash will protect against anyone creating a table
 | 
						|
    in the databases we are using
 | 
						|
  */
 | 
						|
  pthread_mutex_unlock(&LOCK_lock_db);
 | 
						|
  return 0;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/*
 | 
						|
  Rename database.
 | 
						|
 | 
						|
  SYNOPSIS
 | 
						|
    mysql_rename_db()
 | 
						|
    thd                 Thread handler
 | 
						|
    olddb               Old database name
 | 
						|
    newdb               New database name
 | 
						|
 | 
						|
  DESCRIPTION
 | 
						|
   This function is invoked whenever a RENAME DATABASE query is executed:
 | 
						|
 | 
						|
     RENAME DATABASE 'olddb' TO 'newdb'.
 | 
						|
 | 
						|
  NOTES
 | 
						|
 | 
						|
    If we have managed to rename (move) tables to the new database
 | 
						|
    but something failed on a later step, then we store the
 | 
						|
    RENAME DATABASE event in the log. mysql_rename_db() is atomic in
 | 
						|
    the sense that it will rename all or none of the tables.
 | 
						|
 | 
						|
  TODO:
 | 
						|
    - Better trigger, stored procedure, event, grant handling,
 | 
						|
      see the comments below.
 | 
						|
      NOTE: It's probably a good idea to call wait_if_global_read_lock()
 | 
						|
      once in mysql_rename_db(), instead of locking inside all
 | 
						|
      the required functions for renaming triggerts, SP, events, grants, etc.
 | 
						|
 | 
						|
  RETURN VALUES
 | 
						|
    0	ok
 | 
						|
    1	error
 | 
						|
*/
 | 
						|
 | 
						|
 | 
						|
bool mysql_rename_db(THD *thd, LEX_STRING *old_db, LEX_STRING *new_db)
 | 
						|
{
 | 
						|
  int error= 0, change_to_newdb= 0;
 | 
						|
  char path[FN_REFLEN+16];
 | 
						|
  uint length;
 | 
						|
  HA_CREATE_INFO create_info;
 | 
						|
  MY_DIR *dirp;
 | 
						|
  TABLE_LIST *table_list;
 | 
						|
  SELECT_LEX *sl= thd->lex->current_select;
 | 
						|
  DBUG_ENTER("mysql_rename_db");
 | 
						|
 | 
						|
  if (lock_databases(thd, old_db->str, old_db->length,
 | 
						|
                          new_db->str, new_db->length))
 | 
						|
    return 1;
 | 
						|
 | 
						|
  /*
 | 
						|
    Let's remember if we should do "USE newdb" afterwards.
 | 
						|
    thd->db will be cleared in mysql_rename_db()
 | 
						|
  */
 | 
						|
  if (thd->db && !strcmp(thd->db, old_db->str))
 | 
						|
    change_to_newdb= 1;
 | 
						|
 | 
						|
  build_table_filename(path, sizeof(path)-1,
 | 
						|
                       old_db->str, "", MY_DB_OPT_FILE, 0);
 | 
						|
  if ((load_db_opt(thd, path, &create_info)))
 | 
						|
    create_info.default_table_charset= thd->variables.collation_server;
 | 
						|
 | 
						|
  length= build_table_filename(path, sizeof(path)-1, old_db->str, "", "", 0);
 | 
						|
  if (length && path[length-1] == FN_LIBCHAR)
 | 
						|
    path[length-1]=0;                            // remove ending '\'
 | 
						|
  if ((error= my_access(path,F_OK)))
 | 
						|
  {
 | 
						|
    my_error(ER_BAD_DB_ERROR, MYF(0), old_db->str);
 | 
						|
    goto exit;
 | 
						|
  }
 | 
						|
 | 
						|
  /* Step1: Create the new database */
 | 
						|
  if ((error= mysql_create_db(thd, new_db->str, &create_info, 1)))
 | 
						|
    goto exit;
 | 
						|
 | 
						|
  /* Step2: Move tables to the new database */
 | 
						|
  if ((dirp = my_dir(path,MYF(MY_DONT_SORT))))
 | 
						|
  {
 | 
						|
    uint nfiles= (uint) dirp->number_off_files;
 | 
						|
    for (uint idx=0 ; idx < nfiles && !thd->killed ; idx++)
 | 
						|
    {
 | 
						|
      FILEINFO *file= dirp->dir_entry + idx;
 | 
						|
      char *extension, tname[FN_REFLEN];
 | 
						|
      LEX_STRING table_str;
 | 
						|
      DBUG_PRINT("info",("Examining: %s", file->name));
 | 
						|
 | 
						|
      /* skiping non-FRM files */
 | 
						|
      if (my_strcasecmp(files_charset_info,
 | 
						|
                        (extension= fn_rext(file->name)), reg_ext))
 | 
						|
        continue;
 | 
						|
 | 
						|
      /* A frm file found, add the table info rename list */
 | 
						|
      *extension= '\0';
 | 
						|
      
 | 
						|
      table_str.length= filename_to_tablename(file->name,
 | 
						|
                                              tname, sizeof(tname)-1);
 | 
						|
      table_str.str= sql_memdup(tname, table_str.length + 1);
 | 
						|
      Table_ident *old_ident= new Table_ident(thd, *old_db, table_str, 0);
 | 
						|
      Table_ident *new_ident= new Table_ident(thd, *new_db, table_str, 0);
 | 
						|
      if (!old_ident || !new_ident ||
 | 
						|
          !sl->add_table_to_list(thd, old_ident, NULL,
 | 
						|
                                 TL_OPTION_UPDATING, TL_IGNORE) ||
 | 
						|
          !sl->add_table_to_list(thd, new_ident, NULL,
 | 
						|
                                 TL_OPTION_UPDATING, TL_IGNORE))
 | 
						|
      {
 | 
						|
        error= 1;
 | 
						|
        my_dirend(dirp);
 | 
						|
        goto exit;
 | 
						|
      }
 | 
						|
    }
 | 
						|
    my_dirend(dirp);  
 | 
						|
  }
 | 
						|
 | 
						|
  if ((table_list= thd->lex->query_tables) &&
 | 
						|
      (error= mysql_rename_tables(thd, table_list, 1)))
 | 
						|
  {
 | 
						|
    /*
 | 
						|
      Failed to move all tables from the old database to the new one.
 | 
						|
      In the best case mysql_rename_tables() moved all tables back to the old
 | 
						|
      database. In the worst case mysql_rename_tables() moved some tables
 | 
						|
      to the new database, then failed, then started to move the tables back,  and
 | 
						|
      then failed again. In this situation we have some tables in the
 | 
						|
      old database and some tables in the new database.
 | 
						|
      Let's delete the option file, and then the new database directory.
 | 
						|
      If some tables were left in the new directory, rmdir() will fail.
 | 
						|
      It garantees we never loose any tables.
 | 
						|
    */
 | 
						|
    build_table_filename(path, sizeof(path)-1,
 | 
						|
                         new_db->str,"",MY_DB_OPT_FILE, 0);
 | 
						|
    my_delete(path, MYF(MY_WME));
 | 
						|
    length= build_table_filename(path, sizeof(path)-1, new_db->str, "", "", 0);
 | 
						|
    if (length && path[length-1] == FN_LIBCHAR)
 | 
						|
      path[length-1]=0;                            // remove ending '\'
 | 
						|
    rmdir(path);
 | 
						|
    goto exit;
 | 
						|
  }
 | 
						|
 | 
						|
 | 
						|
  /*
 | 
						|
    Step3: move all remaining files to the new db's directory.
 | 
						|
    Skip db opt file: it's been created by mysql_create_db() in
 | 
						|
    the new directory, and will be dropped by mysql_rm_db() in the old one.
 | 
						|
    Trigger TRN and TRG files are be moved as regular files at the moment,
 | 
						|
    without any special treatment.
 | 
						|
 | 
						|
    Triggers without explicit database qualifiers in table names work fine: 
 | 
						|
      use d1;
 | 
						|
      create trigger trg1 before insert on t2 for each row set @a:=1
 | 
						|
      rename database d1 to d2;
 | 
						|
 | 
						|
    TODO: Triggers, having the renamed database explicitely written
 | 
						|
    in the table qualifiers.
 | 
						|
    1. when the same database is renamed:
 | 
						|
        create trigger d1.trg1 before insert on d1.t1 for each row set @a:=1;
 | 
						|
        rename database d1 to d2;
 | 
						|
      Problem: After database renaming, the trigger's body
 | 
						|
               still points to the old database d1.
 | 
						|
    2. when another database is renamed:
 | 
						|
        create trigger d3.trg1 before insert on d3.t1 for each row
 | 
						|
          insert into d1.t1 values (...);
 | 
						|
        rename database d1 to d2;
 | 
						|
      Problem: After renaming d1 to d2, the trigger's body
 | 
						|
               in the database d3 still points to database d1.
 | 
						|
  */
 | 
						|
 | 
						|
  if ((dirp = my_dir(path,MYF(MY_DONT_SORT))))
 | 
						|
  {
 | 
						|
    uint nfiles= (uint) dirp->number_off_files;
 | 
						|
    for (uint idx=0 ; idx < nfiles ; idx++)
 | 
						|
    {
 | 
						|
      FILEINFO *file= dirp->dir_entry + idx;
 | 
						|
      char oldname[FN_REFLEN], newname[FN_REFLEN];
 | 
						|
      DBUG_PRINT("info",("Examining: %s", file->name));
 | 
						|
 | 
						|
      /* skiping . and .. and MY_DB_OPT_FILE */
 | 
						|
      if ((file->name[0] == '.' &&
 | 
						|
           (!file->name[1] || (file->name[1] == '.' && !file->name[2]))) ||
 | 
						|
          !my_strcasecmp(files_charset_info, file->name, MY_DB_OPT_FILE))
 | 
						|
        continue;
 | 
						|
 | 
						|
      /* pass empty file name, and file->name as extension to avoid encoding */
 | 
						|
      build_table_filename(oldname, sizeof(oldname)-1,
 | 
						|
                           old_db->str, "", file->name, 0);
 | 
						|
      build_table_filename(newname, sizeof(newname)-1,
 | 
						|
                           new_db->str, "", file->name, 0);
 | 
						|
      my_rename(oldname, newname, MYF(MY_WME));
 | 
						|
    }
 | 
						|
    my_dirend(dirp);  
 | 
						|
  }
 | 
						|
 | 
						|
  /*
 | 
						|
    Step4: TODO: moving stored procedures in the 'proc' system table
 | 
						|
    We need a new function: sp_move_db_routines(thd, olddb, newdb)
 | 
						|
    Which will basically have the same effect with:
 | 
						|
    UPDATE proc SET db='newdb' WHERE db='olddb'
 | 
						|
    Note, for 5.0 to 5.1 upgrade purposes we don't really need it.
 | 
						|
 | 
						|
    The biggest problem here is that we can't have a lock on LOCK_open() while
 | 
						|
    calling open_table() for 'proc'.
 | 
						|
 | 
						|
    Two solutions:
 | 
						|
    - Start by opening the 'event' and 'proc' (and other) tables for write
 | 
						|
      even before creating the 'to' database.  (This will have the nice
 | 
						|
      effect of blocking another 'rename database' while the lock is active).
 | 
						|
    - Use the solution "Disable create of new tables during lock table"
 | 
						|
 | 
						|
    For an example of how to read through all rows, see:
 | 
						|
    sql_help.cc::search_topics()
 | 
						|
  */
 | 
						|
 | 
						|
  /*
 | 
						|
    Step5: TODO: moving events in the 'event' system table
 | 
						|
    We need a new function evex_move_db_events(thd, olddb, newdb)
 | 
						|
    Which will have the same effect with:
 | 
						|
    UPDATE event SET db='newdb' WHERE db='olddb'
 | 
						|
    Note, for 5.0 to 5.1 upgrade purposes we don't really need it.
 | 
						|
  */
 | 
						|
 | 
						|
  /*
 | 
						|
    Step6: TODO: moving grants in the 'db', 'tables_priv', 'columns_priv'.
 | 
						|
    Update each grant table, doing the same with:
 | 
						|
    UPDATE system_table SET db='newdb' WHERE db='olddb'
 | 
						|
  */
 | 
						|
 | 
						|
  /*
 | 
						|
    Step7: drop the old database.
 | 
						|
    remove_db_from_cache(olddb) and query_cache_invalidate(olddb)
 | 
						|
    are done inside mysql_rm_db(), no needs to execute them again.
 | 
						|
    mysql_rm_db() also "unuses" if we drop the current database.
 | 
						|
  */
 | 
						|
  error= mysql_rm_db(thd, old_db->str, 0, 1);
 | 
						|
 | 
						|
  /* Step8: logging */
 | 
						|
  if (mysql_bin_log.is_open())
 | 
						|
  {
 | 
						|
    Query_log_event qinfo(thd, thd->query, thd->query_length, 0, TRUE);
 | 
						|
    thd->clear_error();
 | 
						|
    mysql_bin_log.write(&qinfo);
 | 
						|
  }
 | 
						|
 | 
						|
  /* Step9: Let's do "use newdb" if we renamed the current database */
 | 
						|
  if (change_to_newdb)
 | 
						|
    error|= mysql_change_db(thd, new_db->str, 0);
 | 
						|
 | 
						|
exit:
 | 
						|
  pthread_mutex_lock(&LOCK_lock_db);
 | 
						|
  /* Remove the databases from db lock cache */
 | 
						|
  lock_db_delete(old_db->str, old_db->length);
 | 
						|
  lock_db_delete(new_db->str, new_db->length);
 | 
						|
  creating_database--;
 | 
						|
  /* Signal waiting CREATE TABLE's to continue */
 | 
						|
  pthread_cond_signal(&COND_refresh);
 | 
						|
  pthread_mutex_unlock(&LOCK_lock_db);
 | 
						|
 | 
						|
  DBUG_RETURN(error);
 | 
						|
}
 | 
						|
 | 
						|
/*
 | 
						|
  Check if there is directory for the database name.
 | 
						|
 | 
						|
  SYNOPSIS
 | 
						|
    check_db_dir_existence()
 | 
						|
    db_name   database name
 | 
						|
 | 
						|
  RETURN VALUES
 | 
						|
    FALSE   There is directory for the specified database name.
 | 
						|
    TRUE    The directory does not exist.
 | 
						|
*/
 | 
						|
 | 
						|
bool check_db_dir_existence(const char *db_name)
 | 
						|
{
 | 
						|
  char db_dir_path[FN_REFLEN];
 | 
						|
  uint db_dir_path_len;
 | 
						|
 | 
						|
  db_dir_path_len= build_table_filename(db_dir_path, sizeof(db_dir_path),
 | 
						|
                                        db_name, "", "", 0);
 | 
						|
 | 
						|
  if (db_dir_path_len && db_dir_path[db_dir_path_len - 1] == FN_LIBCHAR)
 | 
						|
    db_dir_path[db_dir_path_len - 1]= 0;
 | 
						|
 | 
						|
  /* Check access. */
 | 
						|
 | 
						|
  return my_access(db_dir_path, F_OK);
 | 
						|
}
 |