mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
4dabfa5de7
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
2065 lines
79 KiB
C++
2065 lines
79 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 */
|
|
|
|
/*
|
|
Mostly this file is used in the server. But a little part of it is used in
|
|
mysqlbinlog too (definition of SELECT_DISTINCT and others).
|
|
The consequence is that 90% of the file is wrapped in #ifndef MYSQL_CLIENT,
|
|
except the part which must be in the server and in the client.
|
|
*/
|
|
|
|
#ifndef MYSQL_PRIV_H
|
|
#define MYSQL_PRIV_H
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
#include <my_global.h>
|
|
#include <mysql_version.h>
|
|
#include <mysql_embed.h>
|
|
#include <my_sys.h>
|
|
#include <my_time.h>
|
|
#include <m_string.h>
|
|
#include <hash.h>
|
|
#include <signal.h>
|
|
#include <thr_lock.h>
|
|
#include <my_base.h> /* Needed by field.h */
|
|
#include "sql_bitmap.h"
|
|
#include "sql_array.h"
|
|
|
|
/* TODO convert all these three maps to Bitmap classes */
|
|
typedef ulonglong table_map; /* Used for table bits in join */
|
|
#if MAX_INDEXES <= 64
|
|
typedef Bitmap<64> key_map; /* Used for finding keys */
|
|
#else
|
|
typedef Bitmap<((MAX_INDEXES+7)/8*8)> key_map; /* Used for finding keys */
|
|
#endif
|
|
typedef ulong key_part_map; /* Used for finding key parts */
|
|
typedef ulong nesting_map; /* Used for flags of nesting constructs */
|
|
/*
|
|
Used to identify NESTED_JOIN structures within a join (applicable only to
|
|
structures that have not been simplified away and embed more the one
|
|
element)
|
|
*/
|
|
typedef ulonglong nested_join_map;
|
|
|
|
/* query_id */
|
|
typedef ulonglong query_id_t;
|
|
extern query_id_t query_id;
|
|
|
|
/* increment query_id and return it. */
|
|
inline query_id_t next_query_id() { return query_id++; }
|
|
|
|
/* useful constants */
|
|
extern const key_map key_map_empty;
|
|
extern key_map key_map_full; /* Should be threaded as const */
|
|
extern const char *primary_key_name;
|
|
|
|
#include "mysql_com.h"
|
|
#include <violite.h>
|
|
#include "unireg.h"
|
|
|
|
void init_sql_alloc(MEM_ROOT *root, uint block_size, uint pre_alloc_size);
|
|
gptr sql_alloc(unsigned size);
|
|
gptr sql_calloc(unsigned size);
|
|
char *sql_strdup(const char *str);
|
|
char *sql_strmake(const char *str,uint len);
|
|
gptr sql_memdup(const void * ptr,unsigned size);
|
|
void sql_element_free(void *ptr);
|
|
char *sql_strmake_with_convert(const char *str, uint32 arg_length,
|
|
CHARSET_INFO *from_cs,
|
|
uint32 max_res_length,
|
|
CHARSET_INFO *to_cs, uint32 *result_length);
|
|
uint kill_one_thread(THD *thd, ulong id, bool only_kill_query);
|
|
void sql_kill(THD *thd, ulong id, bool only_kill_query);
|
|
bool net_request_file(NET* net, const char* fname);
|
|
char* query_table_status(THD *thd,const char *db,const char *table_name);
|
|
|
|
#define x_free(A) { my_free((gptr) (A),MYF(MY_WME | MY_FAE | MY_ALLOW_ZERO_PTR)); }
|
|
#define safeFree(x) { if(x) { my_free((gptr) x,MYF(0)); x = NULL; } }
|
|
#define PREV_BITS(type,A) ((type) (((type) 1 << (A)) -1))
|
|
#define all_bits_set(A,B) ((A) & (B) != (B))
|
|
|
|
#define WARN_DEPRECATED(Thd,Ver,Old,New) \
|
|
do { \
|
|
DBUG_ASSERT(strncmp(Ver, MYSQL_SERVER_VERSION, sizeof(Ver)-1) >= 0); \
|
|
push_warning_printf(((THD *)Thd), MYSQL_ERROR::WARN_LEVEL_WARN, \
|
|
ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX), \
|
|
(Old), (Ver), (New)); \
|
|
} while(0)
|
|
|
|
|
|
extern CHARSET_INFO *system_charset_info, *files_charset_info ;
|
|
extern CHARSET_INFO *national_charset_info, *table_alias_charset;
|
|
|
|
|
|
enum Derivation
|
|
{
|
|
DERIVATION_IGNORABLE= 5,
|
|
DERIVATION_COERCIBLE= 4,
|
|
DERIVATION_SYSCONST= 3,
|
|
DERIVATION_IMPLICIT= 2,
|
|
DERIVATION_NONE= 1,
|
|
DERIVATION_EXPLICIT= 0
|
|
};
|
|
|
|
|
|
typedef struct my_locale_st
|
|
{
|
|
const char *name;
|
|
const char *description;
|
|
const bool is_ascii;
|
|
TYPELIB *month_names;
|
|
TYPELIB *ab_month_names;
|
|
TYPELIB *day_names;
|
|
TYPELIB *ab_day_names;
|
|
#ifdef __cplusplus
|
|
my_locale_st(const char *name_par, const char *descr_par, bool is_ascii_par,
|
|
TYPELIB *month_names_par, TYPELIB *ab_month_names_par,
|
|
TYPELIB *day_names_par, TYPELIB *ab_day_names_par) :
|
|
name(name_par), description(descr_par), is_ascii(is_ascii_par),
|
|
month_names(month_names_par), ab_month_names(ab_month_names_par),
|
|
day_names(day_names_par), ab_day_names(ab_day_names_par)
|
|
{}
|
|
#endif
|
|
} MY_LOCALE;
|
|
|
|
extern MY_LOCALE my_locale_en_US;
|
|
extern MY_LOCALE *my_locales[];
|
|
|
|
MY_LOCALE *my_locale_by_name(const char *name);
|
|
|
|
/***************************************************************************
|
|
Configuration parameters
|
|
****************************************************************************/
|
|
|
|
#define ACL_CACHE_SIZE 256
|
|
#define MAX_PASSWORD_LENGTH 32
|
|
#define HOST_CACHE_SIZE 128
|
|
#define MAX_ACCEPT_RETRY 10 // Test accept this many times
|
|
#define MAX_FIELDS_BEFORE_HASH 32
|
|
#define USER_VARS_HASH_SIZE 16
|
|
#define TABLE_OPEN_CACHE_MIN 64
|
|
#define TABLE_OPEN_CACHE_DEFAULT 64
|
|
|
|
/*
|
|
Value of 9236 discovered through binary search 2006-09-26 on Ubuntu Dapper
|
|
Drake, libc6 2.3.6-0ubuntu2, Linux kernel 2.6.15-27-686, on x86. (Added
|
|
100 bytes as reasonable buffer against growth and other environments'
|
|
requirements.)
|
|
|
|
Feel free to raise this by the smallest amount you can to get the
|
|
"execution_constants" test to pass.
|
|
*/
|
|
#define STACK_MIN_SIZE 10788 // Abort if less stack during eval.
|
|
|
|
#define STACK_MIN_SIZE_FOR_OPEN 1024*80
|
|
#define STACK_BUFF_ALLOC 256 // For stack overrun checks
|
|
#ifndef MYSQLD_NET_RETRY_COUNT
|
|
#define MYSQLD_NET_RETRY_COUNT 10 // Abort read after this many int.
|
|
#endif
|
|
#define TEMP_POOL_SIZE 128
|
|
|
|
#define QUERY_ALLOC_BLOCK_SIZE 8192
|
|
#define QUERY_ALLOC_PREALLOC_SIZE 8192
|
|
#define TRANS_ALLOC_BLOCK_SIZE 4096
|
|
#define TRANS_ALLOC_PREALLOC_SIZE 4096
|
|
#define RANGE_ALLOC_BLOCK_SIZE 2048
|
|
#define ACL_ALLOC_BLOCK_SIZE 1024
|
|
#define UDF_ALLOC_BLOCK_SIZE 1024
|
|
#define TABLE_ALLOC_BLOCK_SIZE 1024
|
|
#define BDB_LOG_ALLOC_BLOCK_SIZE 1024
|
|
#define WARN_ALLOC_BLOCK_SIZE 2048
|
|
#define WARN_ALLOC_PREALLOC_SIZE 1024
|
|
|
|
/*
|
|
The following parameters is to decide when to use an extra cache to
|
|
optimise seeks when reading a big table in sorted order
|
|
*/
|
|
#define MIN_FILE_LENGTH_TO_USE_ROW_CACHE (10L*1024*1024)
|
|
#define MIN_ROWS_TO_USE_TABLE_CACHE 100
|
|
#define MIN_ROWS_TO_USE_BULK_INSERT 100
|
|
|
|
/*
|
|
The following is used to decide if MySQL should use table scanning
|
|
instead of reading with keys. The number says how many evaluation of the
|
|
WHERE clause is comparable to reading one extra row from a table.
|
|
*/
|
|
#define TIME_FOR_COMPARE 5 // 5 compares == one read
|
|
|
|
/*
|
|
Number of comparisons of table rowids equivalent to reading one row from a
|
|
table.
|
|
*/
|
|
#define TIME_FOR_COMPARE_ROWID (TIME_FOR_COMPARE*2)
|
|
|
|
/*
|
|
For sequential disk seeks the cost formula is:
|
|
DISK_SEEK_BASE_COST + DISK_SEEK_PROP_COST * #blocks_to_skip
|
|
|
|
The cost of average seek
|
|
DISK_SEEK_BASE_COST + DISK_SEEK_PROP_COST*BLOCKS_IN_AVG_SEEK =1.0.
|
|
*/
|
|
#define DISK_SEEK_BASE_COST ((double)0.5)
|
|
|
|
#define BLOCKS_IN_AVG_SEEK 128
|
|
|
|
#define DISK_SEEK_PROP_COST ((double)0.5/BLOCKS_IN_AVG_SEEK)
|
|
|
|
|
|
/*
|
|
Number of rows in a reference table when refereed through a not unique key.
|
|
This value is only used when we don't know anything about the key
|
|
distribution.
|
|
*/
|
|
#define MATCHING_ROWS_IN_OTHER_TABLE 10
|
|
|
|
/* Don't pack string keys shorter than this (if PACK_KEYS=1 isn't used) */
|
|
#define KEY_DEFAULT_PACK_LENGTH 8
|
|
|
|
/* Characters shown for the command in 'show processlist' */
|
|
#define PROCESS_LIST_WIDTH 100
|
|
/* Characters shown for the command in 'information_schema.processlist' */
|
|
#define PROCESS_LIST_INFO_WIDTH 65535
|
|
|
|
#define PRECISION_FOR_DOUBLE 53
|
|
#define PRECISION_FOR_FLOAT 24
|
|
|
|
/* The following can also be changed from the command line */
|
|
#define CONNECT_TIMEOUT 5 // Do not wait long for connect
|
|
#define DEFAULT_CONCURRENCY 10
|
|
#define DELAYED_LIMIT 100 /* pause after xxx inserts */
|
|
#define DELAYED_QUEUE_SIZE 1000
|
|
#define DELAYED_WAIT_TIMEOUT 5*60 /* Wait for delayed insert */
|
|
#define FLUSH_TIME 0 /* Don't flush tables */
|
|
#define MAX_CONNECT_ERRORS 10 // errors before disabling host
|
|
|
|
#ifdef __NETWARE__
|
|
#define IF_NETWARE(A,B) (A)
|
|
#else
|
|
#define IF_NETWARE(A,B) (B)
|
|
#endif
|
|
|
|
#if defined(__WIN__)
|
|
#define IF_WIN(A,B) (A)
|
|
#undef FLUSH_TIME
|
|
#define FLUSH_TIME 1800 /* Flush every half hour */
|
|
|
|
#define INTERRUPT_PRIOR -2
|
|
#define CONNECT_PRIOR -1
|
|
#define WAIT_PRIOR 0
|
|
#define QUERY_PRIOR 2
|
|
#else
|
|
#define IF_WIN(A,B) (B)
|
|
#define INTERRUPT_PRIOR 10
|
|
#define CONNECT_PRIOR 9
|
|
#define WAIT_PRIOR 8
|
|
#define QUERY_PRIOR 6
|
|
#endif /* __WIN92__ */
|
|
|
|
/* Bits from testflag */
|
|
#define TEST_PRINT_CACHED_TABLES 1
|
|
#define TEST_NO_KEY_GROUP 2
|
|
#define TEST_MIT_THREAD 4
|
|
#define TEST_BLOCKING 8
|
|
#define TEST_KEEP_TMP_TABLES 16
|
|
#define TEST_NO_THREADS 32 /* For debugging under Linux */
|
|
#define TEST_READCHECK 64 /* Force use of readcheck */
|
|
#define TEST_NO_EXTRA 128
|
|
#define TEST_CORE_ON_SIGNAL 256 /* Give core if signal */
|
|
#define TEST_NO_STACKTRACE 512
|
|
#define TEST_SIGINT 1024 /* Allow sigint on threads */
|
|
#define TEST_SYNCHRONIZATION 2048 /* get server to do sleep in
|
|
some places */
|
|
#endif
|
|
|
|
/*
|
|
This is included in the server and in the client.
|
|
Options for select set by the yacc parser (stored in lex->options).
|
|
|
|
XXX:
|
|
log_event.h defines OPTIONS_WRITTEN_TO_BIN_LOG to specify what THD
|
|
options list are written into binlog. These options can NOT change their
|
|
values, or it will break replication between version.
|
|
|
|
context is encoded as following:
|
|
SELECT - SELECT_LEX_NODE::options
|
|
THD - THD::options
|
|
intern - neither. used only as
|
|
func(..., select_node->options | thd->options | OPTION_XXX, ...)
|
|
|
|
TODO: separate three contexts above, move them to separate bitfields.
|
|
*/
|
|
|
|
#define SELECT_DISTINCT (LL(1) << 0) // SELECT, user
|
|
#define SELECT_STRAIGHT_JOIN (LL(1) << 1) // SELECT, user
|
|
#define SELECT_DESCRIBE (LL(1) << 2) // SELECT, user
|
|
#define SELECT_SMALL_RESULT (LL(1) << 3) // SELECT, user
|
|
#define SELECT_BIG_RESULT (LL(1) << 4) // SELECT, user
|
|
#define OPTION_FOUND_ROWS (LL(1) << 5) // SELECT, user
|
|
#define OPTION_TO_QUERY_CACHE (LL(1) << 6) // SELECT, user
|
|
#define SELECT_NO_JOIN_CACHE (LL(1) << 7) // intern
|
|
#define OPTION_BIG_TABLES (LL(1) << 8) // THD, user
|
|
#define OPTION_BIG_SELECTS (LL(1) << 9) // THD, user
|
|
#define OPTION_LOG_OFF (LL(1) << 10) // THD, user
|
|
#define OPTION_QUOTE_SHOW_CREATE (LL(1) << 11) // THD, user
|
|
#define TMP_TABLE_ALL_COLUMNS (LL(1) << 12) // SELECT, intern
|
|
#define OPTION_WARNINGS (LL(1) << 13) // THD, user
|
|
#define OPTION_AUTO_IS_NULL (LL(1) << 14) // THD, user, binlog
|
|
#define OPTION_FOUND_COMMENT (LL(1) << 15) // SELECT, intern, parser
|
|
#define OPTION_SAFE_UPDATES (LL(1) << 16) // THD, user
|
|
#define OPTION_BUFFER_RESULT (LL(1) << 17) // SELECT, user
|
|
#define OPTION_BIN_LOG (LL(1) << 18) // THD, user
|
|
#define OPTION_NOT_AUTOCOMMIT (LL(1) << 19) // THD, user
|
|
#define OPTION_BEGIN (LL(1) << 20) // THD, intern
|
|
#define OPTION_TABLE_LOCK (LL(1) << 21) // THD, intern
|
|
#define OPTION_QUICK (LL(1) << 22) // SELECT (for DELETE)
|
|
#define OPTION_KEEP_LOG (LL(1) << 23) // Keep binlog on rollback
|
|
|
|
/* The following is used to detect a conflict with DISTINCT */
|
|
#define SELECT_ALL (LL(1) << 24) // SELECT, user, parser
|
|
|
|
/* Set if we are updating a non-transaction safe table */
|
|
#define OPTION_STATUS_NO_TRANS_UPDATE (LL(1) << 25) // THD, intern
|
|
|
|
/* The following can be set when importing tables in a 'wrong order'
|
|
to suppress foreign key checks */
|
|
#define OPTION_NO_FOREIGN_KEY_CHECKS (LL(1) << 26) // THD, user, binlog
|
|
/* The following speeds up inserts to InnoDB tables by suppressing unique
|
|
key checks in some cases */
|
|
#define OPTION_RELAXED_UNIQUE_CHECKS (LL(1) << 27) // THD, user, binlog
|
|
#define SELECT_NO_UNLOCK (LL(1) << 28) // SELECT, intern
|
|
#define OPTION_SCHEMA_TABLE (LL(1) << 29) // SELECT, intern
|
|
/* Flag set if setup_tables already done */
|
|
#define OPTION_SETUP_TABLES_DONE (LL(1) << 30) // intern
|
|
/* If not set then the thread will ignore all warnings with level notes. */
|
|
#define OPTION_SQL_NOTES (LL(1) << 31) // THD, user
|
|
/*
|
|
Force the used temporary table to be a MyISAM table (because we will use
|
|
fulltext functions when reading from it.
|
|
*/
|
|
#define TMP_TABLE_FORCE_MYISAM (LL(1) << 32)
|
|
|
|
/*
|
|
Maximum length of time zone name that we support
|
|
(Time zone name is char(64) in db). mysqlbinlog needs it.
|
|
*/
|
|
#define MAX_TIME_ZONE_NAME_LENGTH 72
|
|
|
|
/* The rest of the file is included in the server only */
|
|
#ifndef MYSQL_CLIENT
|
|
|
|
/* Bits for different SQL modes modes (including ANSI mode) */
|
|
#define MODE_REAL_AS_FLOAT 1
|
|
#define MODE_PIPES_AS_CONCAT 2
|
|
#define MODE_ANSI_QUOTES 4
|
|
#define MODE_IGNORE_SPACE 8
|
|
#define MODE_NOT_USED 16
|
|
#define MODE_ONLY_FULL_GROUP_BY 32
|
|
#define MODE_NO_UNSIGNED_SUBTRACTION 64
|
|
#define MODE_NO_DIR_IN_CREATE 128
|
|
#define MODE_POSTGRESQL 256
|
|
#define MODE_ORACLE 512
|
|
#define MODE_MSSQL 1024
|
|
#define MODE_DB2 2048
|
|
#define MODE_MAXDB 4096
|
|
#define MODE_NO_KEY_OPTIONS 8192
|
|
#define MODE_NO_TABLE_OPTIONS 16384
|
|
#define MODE_NO_FIELD_OPTIONS 32768
|
|
#define MODE_MYSQL323 65536
|
|
#define MODE_MYSQL40 (MODE_MYSQL323*2)
|
|
#define MODE_ANSI (MODE_MYSQL40*2)
|
|
#define MODE_NO_AUTO_VALUE_ON_ZERO (MODE_ANSI*2)
|
|
#define MODE_NO_BACKSLASH_ESCAPES (MODE_NO_AUTO_VALUE_ON_ZERO*2)
|
|
#define MODE_STRICT_TRANS_TABLES (MODE_NO_BACKSLASH_ESCAPES*2)
|
|
#define MODE_STRICT_ALL_TABLES (MODE_STRICT_TRANS_TABLES*2)
|
|
#define MODE_NO_ZERO_IN_DATE (MODE_STRICT_ALL_TABLES*2)
|
|
#define MODE_NO_ZERO_DATE (MODE_NO_ZERO_IN_DATE*2)
|
|
#define MODE_INVALID_DATES (MODE_NO_ZERO_DATE*2)
|
|
#define MODE_ERROR_FOR_DIVISION_BY_ZERO (MODE_INVALID_DATES*2)
|
|
#define MODE_TRADITIONAL (MODE_ERROR_FOR_DIVISION_BY_ZERO*2)
|
|
#define MODE_NO_AUTO_CREATE_USER (MODE_TRADITIONAL*2)
|
|
#define MODE_HIGH_NOT_PRECEDENCE (MODE_NO_AUTO_CREATE_USER*2)
|
|
#define MODE_NO_ENGINE_SUBSTITUTION (MODE_HIGH_NOT_PRECEDENCE*2)
|
|
/*
|
|
Replication uses 8 bytes to store SQL_MODE in the binary log. The day you
|
|
use strictly more than 64 bits by adding one more define above, you should
|
|
contact the replication team because the replication code should then be
|
|
updated (to store more bytes on disk).
|
|
|
|
NOTE: When adding new SQL_MODE types, make sure to also add them to
|
|
../scripts/mysql_create_system_tables.sh and
|
|
../scripts/mysql_fix_privilege_tables.sql
|
|
*/
|
|
|
|
#define RAID_BLOCK_SIZE 1024
|
|
|
|
#define MY_CHARSET_BIN_MB_MAXLEN 1
|
|
|
|
// uncachable cause
|
|
#define UNCACHEABLE_DEPENDENT 1
|
|
#define UNCACHEABLE_RAND 2
|
|
#define UNCACHEABLE_SIDEEFFECT 4
|
|
// forcing to save JOIN for explain
|
|
#define UNCACHEABLE_EXPLAIN 8
|
|
/* Don't evaluate subqueries in prepare even if they're not correlated */
|
|
#define UNCACHEABLE_PREPARE 16
|
|
|
|
#ifdef EXTRA_DEBUG
|
|
/*
|
|
Sync points allow us to force the server to reach a certain line of code
|
|
and block there until the client tells the server it is ok to go on.
|
|
The client tells the server to block with SELECT GET_LOCK()
|
|
and unblocks it with SELECT RELEASE_LOCK(). Used for debugging difficult
|
|
concurrency problems
|
|
*/
|
|
#define DBUG_SYNC_POINT(lock_name,lock_timeout) \
|
|
debug_sync_point(lock_name,lock_timeout)
|
|
void debug_sync_point(const char* lock_name, uint lock_timeout);
|
|
#else
|
|
#define DBUG_SYNC_POINT(lock_name,lock_timeout)
|
|
#endif /* EXTRA_DEBUG */
|
|
|
|
/* BINLOG_DUMP options */
|
|
|
|
#define BINLOG_DUMP_NON_BLOCK 1
|
|
|
|
/* sql_show.cc:show_log_files() */
|
|
#define SHOW_LOG_STATUS_FREE "FREE"
|
|
#define SHOW_LOG_STATUS_INUSE "IN USE"
|
|
|
|
struct st_table_list;
|
|
class String;
|
|
void view_store_options(THD *thd, st_table_list *table, String *buff);
|
|
|
|
/* Options to add_table_to_list() */
|
|
#define TL_OPTION_UPDATING 1
|
|
#define TL_OPTION_FORCE_INDEX 2
|
|
#define TL_OPTION_IGNORE_LEAVES 4
|
|
#define TL_OPTION_ALIAS 8
|
|
|
|
/* Some portable defines */
|
|
|
|
#define portable_sizeof_char_ptr 8
|
|
|
|
#define tmp_file_prefix "#sql" /* Prefix for tmp tables */
|
|
#define tmp_file_prefix_length 4
|
|
|
|
/* Flags for calc_week() function. */
|
|
#define WEEK_MONDAY_FIRST 1
|
|
#define WEEK_YEAR 2
|
|
#define WEEK_FIRST_WEEKDAY 4
|
|
|
|
#define STRING_BUFFER_USUAL_SIZE 80
|
|
|
|
/*
|
|
Some defines for exit codes for ::is_equal class functions.
|
|
*/
|
|
#define IS_EQUAL_NO 0
|
|
#define IS_EQUAL_YES 1
|
|
#define IS_EQUAL_PACK_LENGTH 2
|
|
|
|
enum enum_parsing_place
|
|
{
|
|
NO_MATTER,
|
|
IN_HAVING,
|
|
SELECT_LIST,
|
|
IN_WHERE,
|
|
IN_ON
|
|
};
|
|
|
|
struct st_table;
|
|
class THD;
|
|
|
|
/* Struct to handle simple linked lists */
|
|
|
|
typedef struct st_sql_list {
|
|
uint elements;
|
|
byte *first;
|
|
byte **next;
|
|
|
|
st_sql_list() {} /* Remove gcc warning */
|
|
inline void empty()
|
|
{
|
|
elements=0;
|
|
first=0;
|
|
next= &first;
|
|
}
|
|
inline void link_in_list(byte *element,byte **next_ptr)
|
|
{
|
|
elements++;
|
|
(*next)=element;
|
|
next= next_ptr;
|
|
*next=0;
|
|
}
|
|
inline void save_and_clear(struct st_sql_list *save)
|
|
{
|
|
*save= *this;
|
|
empty();
|
|
}
|
|
inline void push_front(struct st_sql_list *save)
|
|
{
|
|
*save->next= first; /* link current list last */
|
|
first= save->first;
|
|
elements+= save->elements;
|
|
}
|
|
inline void push_back(struct st_sql_list *save)
|
|
{
|
|
if (save->first)
|
|
{
|
|
*next= save->first;
|
|
next= save->next;
|
|
elements+= save->elements;
|
|
}
|
|
}
|
|
} SQL_LIST;
|
|
|
|
|
|
extern pthread_key(THD*, THR_THD);
|
|
inline THD *_current_thd(void)
|
|
{
|
|
return my_pthread_getspecific_ptr(THD*,THR_THD);
|
|
}
|
|
#define current_thd _current_thd()
|
|
|
|
/* below functions are required for plugins as THD class is opaque */
|
|
my_bool thd_in_lock_tables(const THD *thd);
|
|
my_bool thd_tablespace_op(const THD *thd);
|
|
const char *thd_proc_info(THD *thd, const char *info);
|
|
void **thd_ha_data(const THD *thd, const struct handlerton *hton);
|
|
|
|
/*
|
|
External variables
|
|
*/
|
|
extern ulong server_id, concurrency;
|
|
|
|
|
|
typedef my_bool (*qc_engine_callback)(THD *thd, char *table_key,
|
|
uint key_length,
|
|
ulonglong *engine_data);
|
|
#include "sql_string.h"
|
|
#include "sql_list.h"
|
|
#include "sql_map.h"
|
|
#include "my_decimal.h"
|
|
#include "sql_plugin.h"
|
|
#include "handler.h"
|
|
#include "parse_file.h"
|
|
#include "table.h"
|
|
#include "sql_error.h"
|
|
#include "field.h" /* Field definitions */
|
|
#include "protocol.h"
|
|
#include "sql_udf.h"
|
|
#include "sql_partition.h"
|
|
|
|
class user_var_entry;
|
|
class Security_context;
|
|
enum enum_var_type
|
|
{
|
|
OPT_DEFAULT= 0, OPT_SESSION, OPT_GLOBAL
|
|
};
|
|
class sys_var;
|
|
#ifdef MYSQL_SERVER
|
|
class Comp_creator;
|
|
typedef Comp_creator* (*chooser_compare_func_creator)(bool invert);
|
|
#endif
|
|
#include "item.h"
|
|
extern my_decimal decimal_zero;
|
|
|
|
/* sql_parse.cc */
|
|
void free_items(Item *item);
|
|
void cleanup_items(Item *item);
|
|
class THD;
|
|
void close_thread_tables(THD *thd, bool locked=0, bool skip_derived=0);
|
|
bool check_one_table_access(THD *thd, ulong privilege, TABLE_LIST *tables);
|
|
bool check_single_table_access(THD *thd, ulong privilege,
|
|
TABLE_LIST *tables);
|
|
bool check_routine_access(THD *thd,ulong want_access,char *db,char *name,
|
|
bool is_proc, bool no_errors);
|
|
bool check_some_access(THD *thd, ulong want_access, TABLE_LIST *table);
|
|
bool check_merge_table_access(THD *thd, char *db, TABLE_LIST *table_list);
|
|
bool check_some_routine_access(THD *thd, const char *db, const char *name, bool is_proc);
|
|
bool multi_update_precheck(THD *thd, TABLE_LIST *tables);
|
|
bool multi_delete_precheck(THD *thd, TABLE_LIST *tables);
|
|
bool mysql_multi_update_prepare(THD *thd);
|
|
bool mysql_multi_delete_prepare(THD *thd);
|
|
bool mysql_insert_select_prepare(THD *thd);
|
|
bool update_precheck(THD *thd, TABLE_LIST *tables);
|
|
bool delete_precheck(THD *thd, TABLE_LIST *tables);
|
|
bool insert_precheck(THD *thd, TABLE_LIST *tables);
|
|
bool create_table_precheck(THD *thd, TABLE_LIST *tables,
|
|
TABLE_LIST *create_table);
|
|
int append_query_string(CHARSET_INFO *csinfo,
|
|
String const *from, String *to);
|
|
|
|
void get_default_definer(THD *thd, LEX_USER *definer);
|
|
LEX_USER *create_default_definer(THD *thd);
|
|
LEX_USER *create_definer(THD *thd, LEX_STRING *user_name, LEX_STRING *host_name);
|
|
LEX_USER *get_current_user(THD *thd, LEX_USER *user);
|
|
bool check_string_length(LEX_STRING *str,
|
|
const char *err_msg, uint max_length);
|
|
|
|
enum enum_mysql_completiontype {
|
|
ROLLBACK_RELEASE=-2, ROLLBACK=1, ROLLBACK_AND_CHAIN=7,
|
|
COMMIT_RELEASE=-1, COMMIT=0, COMMIT_AND_CHAIN=6
|
|
};
|
|
|
|
bool begin_trans(THD *thd);
|
|
bool end_active_trans(THD *thd);
|
|
int end_trans(THD *thd, enum enum_mysql_completiontype completion);
|
|
|
|
Item *negate_expression(THD *thd, Item *expr);
|
|
#include "sql_class.h"
|
|
#include "sql_acl.h"
|
|
#include "tztime.h"
|
|
#ifdef MYSQL_SERVER
|
|
#include "sql_servers.h"
|
|
#include "opt_range.h"
|
|
|
|
#ifdef HAVE_QUERY_CACHE
|
|
struct Query_cache_query_flags
|
|
{
|
|
unsigned int client_long_flag:1;
|
|
unsigned int client_protocol_41:1;
|
|
unsigned int more_results_exists:1;
|
|
unsigned int pkt_nr;
|
|
uint character_set_client_num;
|
|
uint character_set_results_num;
|
|
uint collation_connection_num;
|
|
ha_rows limit;
|
|
Time_zone *time_zone;
|
|
ulong sql_mode;
|
|
ulong max_sort_length;
|
|
ulong group_concat_max_len;
|
|
MY_LOCALE *lc_time_names;
|
|
};
|
|
#define QUERY_CACHE_FLAGS_SIZE sizeof(Query_cache_query_flags)
|
|
#include "sql_cache.h"
|
|
#define query_cache_store_query(A, B) query_cache.store_query(A, B)
|
|
#define query_cache_destroy() query_cache.destroy()
|
|
#define query_cache_result_size_limit(A) query_cache.result_size_limit(A)
|
|
#define query_cache_init() query_cache.init()
|
|
#define query_cache_resize(A) query_cache.resize(A)
|
|
#define query_cache_set_min_res_unit(A) query_cache.set_min_res_unit(A)
|
|
#define query_cache_invalidate3(A, B, C) query_cache.invalidate(A, B, C)
|
|
#define query_cache_invalidate1(A) query_cache.invalidate(A)
|
|
#define query_cache_send_result_to_client(A, B, C) \
|
|
query_cache.send_result_to_client(A, B, C)
|
|
#define query_cache_invalidate_by_MyISAM_filename_ref \
|
|
&query_cache_invalidate_by_MyISAM_filename
|
|
#else
|
|
#define QUERY_CACHE_FLAGS_SIZE 0
|
|
#define query_cache_store_query(A, B)
|
|
#define query_cache_destroy()
|
|
#define query_cache_result_size_limit(A)
|
|
#define query_cache_init()
|
|
#define query_cache_resize(A)
|
|
#define query_cache_set_min_res_unit(A)
|
|
#define query_cache_invalidate3(A, B, C)
|
|
#define query_cache_invalidate1(A)
|
|
#define query_cache_send_result_to_client(A, B, C) 0
|
|
#define query_cache_invalidate_by_MyISAM_filename_ref NULL
|
|
|
|
#define query_cache_abort(A)
|
|
#define query_cache_end_of_result(A)
|
|
#define query_cache_invalidate_by_MyISAM_filename_ref NULL
|
|
#endif /*HAVE_QUERY_CACHE*/
|
|
|
|
/*
|
|
Error injector Macros to enable easy testing of recovery after failures
|
|
in various error cases.
|
|
*/
|
|
#ifndef ERROR_INJECT_SUPPORT
|
|
|
|
#define ERROR_INJECT(x) 0
|
|
#define ERROR_INJECT_ACTION(x,action) 0
|
|
#define ERROR_INJECT_CRASH(x) 0
|
|
#define ERROR_INJECT_VALUE(x) 0
|
|
#define ERROR_INJECT_VALUE_ACTION(x,action) 0
|
|
#define ERROR_INJECT_VALUE_CRASH(x) 0
|
|
#define SET_ERROR_INJECT_VALUE(x)
|
|
|
|
#else
|
|
|
|
inline bool check_and_unset_keyword(const char *dbug_str)
|
|
{
|
|
const char *extra_str= "-d,";
|
|
char total_str[200];
|
|
if (_db_strict_keyword_ (dbug_str))
|
|
{
|
|
strxmov(total_str, extra_str, dbug_str, NullS);
|
|
DBUG_SET(total_str);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
inline bool
|
|
check_and_unset_inject_value(int value)
|
|
{
|
|
THD *thd= current_thd;
|
|
if (thd->error_inject_value == (uint)value)
|
|
{
|
|
thd->error_inject_value= 0;
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
ERROR INJECT MODULE:
|
|
--------------------
|
|
These macros are used to insert macros from the application code.
|
|
The event that activates those error injections can be activated
|
|
from SQL by using:
|
|
SET SESSION dbug=+d,code;
|
|
|
|
After the error has been injected, the macros will automatically
|
|
remove the debug code, thus similar to using:
|
|
SET SESSION dbug=-d,code
|
|
from SQL.
|
|
|
|
ERROR_INJECT_CRASH will inject a crash of the MySQL Server if code
|
|
is set when macro is called. ERROR_INJECT_CRASH can be used in
|
|
if-statements, it will always return FALSE unless of course it
|
|
crashes in which case it doesn't return at all.
|
|
|
|
ERROR_INJECT_ACTION will inject the action specified in the action
|
|
parameter of the macro, before performing the action the code will
|
|
be removed such that no more events occur. ERROR_INJECT_ACTION
|
|
can also be used in if-statements and always returns FALSE.
|
|
ERROR_INJECT can be used in a normal if-statement, where the action
|
|
part is performed in the if-block. The macro returns TRUE if the
|
|
error was activated and otherwise returns FALSE. If activated the
|
|
code is removed.
|
|
|
|
Sometimes it is necessary to perform error inject actions as a serie
|
|
of events. In this case one can use one variable on the THD object.
|
|
Thus one sets this value by using e.g. SET_ERROR_INJECT_VALUE(100).
|
|
Then one can later test for it by using ERROR_INJECT_CRASH_VALUE,
|
|
ERROR_INJECT_ACTION_VALUE and ERROR_INJECT_VALUE. This have the same
|
|
behaviour as the above described macros except that they use the
|
|
error inject value instead of a code used by DBUG macros.
|
|
*/
|
|
#define SET_ERROR_INJECT_VALUE(x) \
|
|
current_thd->error_inject_value= (x)
|
|
#define ERROR_INJECT_CRASH(code) \
|
|
DBUG_EVALUATE_IF(code, (abort(), 0), 0)
|
|
#define ERROR_INJECT_ACTION(code, action) \
|
|
(check_and_unset_keyword(code) ? ((action), 0) : 0)
|
|
#define ERROR_INJECT(code) \
|
|
check_and_unset_keyword(code)
|
|
#define ERROR_INJECT_VALUE(value) \
|
|
check_and_unset_inject_value(value)
|
|
#define ERROR_INJECT_VALUE_ACTION(value,action) \
|
|
(check_and_unset_inject_value(value) ? (action) : 0)
|
|
#define ERROR_INJECT_VALUE_CRASH(value) \
|
|
ERROR_INJECT_VALUE_ACTION(value, (abort(), 0))
|
|
|
|
#endif
|
|
|
|
uint build_table_path(char *buff, size_t bufflen, const char *db,
|
|
const char *table, const char *ext);
|
|
void write_bin_log(THD *thd, bool clear_error,
|
|
char const *query, ulong query_length);
|
|
|
|
bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create, bool silent);
|
|
bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create);
|
|
bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent);
|
|
bool mysql_rename_db(THD *thd, LEX_STRING *old_db, LEX_STRING *new_db);
|
|
void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos, ushort flags);
|
|
void mysql_client_binlog_statement(THD *thd);
|
|
bool mysql_rm_table(THD *thd,TABLE_LIST *tables, my_bool if_exists,
|
|
my_bool drop_temporary);
|
|
int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
|
|
bool drop_temporary, bool drop_view, bool log_query);
|
|
int mysql_rm_table_part2_with_lock(THD *thd, TABLE_LIST *tables,
|
|
bool if_exists, bool drop_temporary,
|
|
bool log_query);
|
|
bool quick_rm_table(handlerton *base,const char *db,
|
|
const char *table_name, uint flags);
|
|
void close_cached_table(THD *thd, TABLE *table);
|
|
bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list, bool silent);
|
|
bool do_rename(THD *thd, TABLE_LIST *ren_table, char *new_db,
|
|
char *new_table_name, char *new_table_alias,
|
|
bool skip_error);
|
|
bool mysql_change_db(THD *thd,const char *name,bool no_access_check);
|
|
void mysql_parse(THD *thd,char *inBuf,uint length);
|
|
bool mysql_test_parse_for_slave(THD *thd,char *inBuf,uint length);
|
|
bool is_update_query(enum enum_sql_command command);
|
|
bool alloc_query(THD *thd, const char *packet, uint packet_length);
|
|
void mysql_init_select(LEX *lex);
|
|
void mysql_reset_thd_for_next_command(THD *thd);
|
|
void mysql_init_query(THD *thd, uchar *buf, uint length);
|
|
bool mysql_new_select(LEX *lex, bool move_down);
|
|
void create_select_for_variable(const char *var_name);
|
|
void mysql_init_multi_delete(LEX *lex);
|
|
bool multi_delete_set_locks_and_link_aux_tables(LEX *lex);
|
|
void init_max_user_conn(void);
|
|
void init_update_queries(void);
|
|
void free_max_user_conn(void);
|
|
pthread_handler_t handle_one_connection(void *arg);
|
|
pthread_handler_t handle_bootstrap(void *arg);
|
|
void end_thread(THD *thd,bool put_in_cache);
|
|
void flush_thread_cache();
|
|
bool mysql_execute_command(THD *thd);
|
|
bool do_command(THD *thd);
|
|
bool dispatch_command(enum enum_server_command command, THD *thd,
|
|
char* packet, uint packet_length);
|
|
void log_slow_statement(THD *thd);
|
|
bool check_dup(const char *db, const char *name, TABLE_LIST *tables);
|
|
bool append_file_to_dir(THD *thd, const char **filename_ptr,
|
|
const char *table_name);
|
|
|
|
bool table_cache_init(void);
|
|
void table_cache_free(void);
|
|
bool table_def_init(void);
|
|
void table_def_free(void);
|
|
void assign_new_table_id(TABLE_SHARE *share);
|
|
uint cached_open_tables(void);
|
|
uint cached_table_definitions(void);
|
|
void kill_mysql(void);
|
|
void close_connection(THD *thd, uint errcode, bool lock);
|
|
bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
|
|
bool *write_to_binlog);
|
|
bool check_access(THD *thd, ulong access, const char *db, ulong *save_priv,
|
|
bool no_grant, bool no_errors, bool schema_db);
|
|
bool check_table_access(THD *thd, ulong want_access, TABLE_LIST *tables,
|
|
bool no_errors);
|
|
bool check_global_access(THD *thd, ulong want_access);
|
|
|
|
/*
|
|
Support routine for SQL parser on partitioning syntax
|
|
*/
|
|
my_bool is_partition_management(LEX *lex);
|
|
/*
|
|
General routine to change field->ptr of a NULL-terminated array of Field
|
|
objects. Useful when needed to call val_int, val_str or similar and the
|
|
field data is not in table->record[0] but in some other structure.
|
|
set_key_field_ptr changes all fields of an index using a key_info object.
|
|
All methods presume that there is at least one field to change.
|
|
*/
|
|
|
|
void set_field_ptr(Field **ptr, const byte *new_buf, const byte *old_buf);
|
|
void set_key_field_ptr(KEY *key_info, const byte *new_buf,
|
|
const byte *old_buf);
|
|
|
|
bool mysql_backup_table(THD* thd, TABLE_LIST* table_list);
|
|
bool mysql_restore_table(THD* thd, TABLE_LIST* table_list);
|
|
|
|
bool mysql_checksum_table(THD* thd, TABLE_LIST* table_list,
|
|
HA_CHECK_OPT* check_opt);
|
|
bool mysql_check_table(THD* thd, TABLE_LIST* table_list,
|
|
HA_CHECK_OPT* check_opt);
|
|
bool mysql_repair_table(THD* thd, TABLE_LIST* table_list,
|
|
HA_CHECK_OPT* check_opt);
|
|
bool mysql_analyze_table(THD* thd, TABLE_LIST* table_list,
|
|
HA_CHECK_OPT* check_opt);
|
|
bool mysql_optimize_table(THD* thd, TABLE_LIST* table_list,
|
|
HA_CHECK_OPT* check_opt);
|
|
bool mysql_assign_to_keycache(THD* thd, TABLE_LIST* table_list,
|
|
LEX_STRING *key_cache_name);
|
|
bool mysql_preload_keys(THD* thd, TABLE_LIST* table_list);
|
|
int reassign_keycache_tables(THD* thd, KEY_CACHE *src_cache,
|
|
KEY_CACHE *dst_cache);
|
|
TABLE *create_virtual_tmp_table(THD *thd, List<create_field> &field_list);
|
|
|
|
bool mysql_xa_recover(THD *thd);
|
|
|
|
bool check_simple_select();
|
|
int mysql_alter_tablespace(THD* thd, st_alter_tablespace *ts_info);
|
|
|
|
SORT_FIELD * make_unireg_sortorder(ORDER *order, uint *length,
|
|
SORT_FIELD *sortorder);
|
|
int setup_order(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
|
|
List<Item> &fields, List <Item> &all_fields, ORDER *order);
|
|
int setup_group(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
|
|
List<Item> &fields, List<Item> &all_fields, ORDER *order,
|
|
bool *hidden_group_fields);
|
|
|
|
bool handle_select(THD *thd, LEX *lex, select_result *result,
|
|
ulong setup_tables_done_option);
|
|
bool mysql_select(THD *thd, Item ***rref_pointer_array,
|
|
TABLE_LIST *tables, uint wild_num, List<Item> &list,
|
|
COND *conds, uint og_num, ORDER *order, ORDER *group,
|
|
Item *having, ORDER *proc_param, ulonglong select_type,
|
|
select_result *result, SELECT_LEX_UNIT *unit,
|
|
SELECT_LEX *select_lex);
|
|
void free_underlaid_joins(THD *thd, SELECT_LEX *select);
|
|
bool mysql_explain_union(THD *thd, SELECT_LEX_UNIT *unit,
|
|
select_result *result);
|
|
int mysql_explain_select(THD *thd, SELECT_LEX *sl, char const *type,
|
|
select_result *result);
|
|
bool mysql_union(THD *thd, LEX *lex, select_result *result,
|
|
SELECT_LEX_UNIT *unit, ulong setup_tables_done_option);
|
|
bool mysql_handle_derived(LEX *lex, bool (*processor)(THD *thd,
|
|
LEX *lex,
|
|
TABLE_LIST *table));
|
|
bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *t);
|
|
bool mysql_derived_filling(THD *thd, LEX *lex, TABLE_LIST *t);
|
|
Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
|
|
Item ***copy_func, Field **from_field,
|
|
Field **def_field,
|
|
bool group, bool modify_item,
|
|
bool table_cant_handle_bit_fields,
|
|
bool make_copy_field,
|
|
uint convert_blob_length);
|
|
void sp_prepare_create_field(THD *thd, create_field *sql_field);
|
|
int prepare_create_field(create_field *sql_field,
|
|
uint *blob_columns,
|
|
int *timestamps, int *timestamps_with_niladic,
|
|
longlong table_flags);
|
|
bool mysql_create_table(THD *thd,const char *db, const char *table_name,
|
|
HA_CREATE_INFO *create_info,
|
|
List<create_field> &fields, List<Key> &keys,
|
|
bool tmp_table, uint select_field_count,
|
|
bool use_copy_create_info);
|
|
|
|
bool mysql_alter_table(THD *thd, char *new_db, char *new_name,
|
|
HA_CREATE_INFO *create_info,
|
|
TABLE_LIST *table_list,
|
|
List<create_field> &fields,
|
|
List<Key> &keys,
|
|
uint order_num, ORDER *order, bool ignore,
|
|
ALTER_INFO *alter_info, bool do_send_ok);
|
|
bool mysql_recreate_table(THD *thd, TABLE_LIST *table_list, bool do_send_ok);
|
|
bool mysql_create_like_table(THD *thd, TABLE_LIST *table,
|
|
HA_CREATE_INFO *create_info,
|
|
Table_ident *src_table);
|
|
bool mysql_rename_table(handlerton *base, const char *old_db,
|
|
const char * old_name, const char *new_db,
|
|
const char * new_name, uint flags);
|
|
bool mysql_create_index(THD *thd, TABLE_LIST *table_list, List<Key> &keys);
|
|
bool mysql_drop_index(THD *thd, TABLE_LIST *table_list,
|
|
ALTER_INFO *alter_info);
|
|
bool mysql_prepare_update(THD *thd, TABLE_LIST *table_list,
|
|
Item **conds, uint order_num, ORDER *order);
|
|
int mysql_update(THD *thd,TABLE_LIST *tables,List<Item> &fields,
|
|
List<Item> &values,COND *conds,
|
|
uint order_num, ORDER *order, ha_rows limit,
|
|
enum enum_duplicates handle_duplicates, bool ignore);
|
|
bool mysql_multi_update(THD *thd, TABLE_LIST *table_list,
|
|
List<Item> *fields, List<Item> *values,
|
|
COND *conds, ulonglong options,
|
|
enum enum_duplicates handle_duplicates, bool ignore,
|
|
SELECT_LEX_UNIT *unit, SELECT_LEX *select_lex);
|
|
bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list, TABLE *table,
|
|
List<Item> &fields, List_item *values,
|
|
List<Item> &update_fields,
|
|
List<Item> &update_values, enum_duplicates duplic,
|
|
COND **where, bool select_insert);
|
|
bool mysql_insert(THD *thd,TABLE_LIST *table,List<Item> &fields,
|
|
List<List_item> &values, List<Item> &update_fields,
|
|
List<Item> &update_values, enum_duplicates flag,
|
|
bool ignore);
|
|
int check_that_all_fields_are_given_values(THD *thd, TABLE *entry,
|
|
TABLE_LIST *table_list);
|
|
bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds);
|
|
bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
|
|
SQL_LIST *order, ha_rows rows, ulonglong options,
|
|
bool reset_auto_increment);
|
|
bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok);
|
|
bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create);
|
|
uint create_table_def_key(THD *thd, char *key, TABLE_LIST *table_list,
|
|
bool tmp_table);
|
|
TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, char *key,
|
|
uint key_length, uint db_flags, int *error);
|
|
void release_table_share(TABLE_SHARE *share, enum release_type type);
|
|
TABLE_SHARE *get_cached_table_share(const char *db, const char *table_name);
|
|
TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update);
|
|
TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT* mem,
|
|
bool *refresh, uint flags);
|
|
bool reopen_name_locked_table(THD* thd, TABLE_LIST* table);
|
|
TABLE *find_locked_table(THD *thd, const char *db,const char *table_name);
|
|
bool reopen_tables(THD *thd,bool get_locks,bool in_refresh);
|
|
bool close_data_tables(THD *thd,const char *db, const char *table_name);
|
|
bool wait_for_tables(THD *thd);
|
|
bool table_is_used(TABLE *table, bool wait_for_name_lock);
|
|
TABLE *drop_locked_tables(THD *thd,const char *db, const char *table_name);
|
|
void abort_locked_tables(THD *thd,const char *db, const char *table_name);
|
|
void execute_init_command(THD *thd, sys_var_str *init_command_var,
|
|
rw_lock_t *var_mutex);
|
|
extern Field *not_found_field;
|
|
extern Field *view_ref_found;
|
|
|
|
enum find_item_error_report_type {REPORT_ALL_ERRORS, REPORT_EXCEPT_NOT_FOUND,
|
|
IGNORE_ERRORS, REPORT_EXCEPT_NON_UNIQUE,
|
|
IGNORE_EXCEPT_NON_UNIQUE};
|
|
Field *
|
|
find_field_in_tables(THD *thd, Item_ident *item,
|
|
TABLE_LIST *first_table, TABLE_LIST *last_table,
|
|
Item **ref, find_item_error_report_type report_error,
|
|
bool check_privileges, bool register_tree_change);
|
|
Field *
|
|
find_field_in_table_ref(THD *thd, TABLE_LIST *table_list,
|
|
const char *name, uint length,
|
|
const char *item_name, const char *db_name,
|
|
const char *table_name, Item **ref,
|
|
bool check_privileges, bool allow_rowid,
|
|
uint *cached_field_index_ptr,
|
|
bool register_tree_change, TABLE_LIST **actual_table);
|
|
Field *
|
|
find_field_in_table(THD *thd, TABLE *table, const char *name, uint length,
|
|
bool allow_rowid, uint *cached_field_index_ptr);
|
|
Field *
|
|
find_field_in_table_sef(TABLE *table, const char *name);
|
|
|
|
#endif /* MYSQL_SERVER */
|
|
|
|
#ifdef HAVE_OPENSSL
|
|
#include <openssl/des.h>
|
|
struct st_des_keyblock
|
|
{
|
|
DES_cblock key1, key2, key3;
|
|
};
|
|
struct st_des_keyschedule
|
|
{
|
|
DES_key_schedule ks1, ks2, ks3;
|
|
};
|
|
extern char *des_key_file;
|
|
extern struct st_des_keyschedule des_keyschedule[10];
|
|
extern uint des_default_key;
|
|
extern pthread_mutex_t LOCK_des_key_file;
|
|
bool load_des_key_file(const char *file_name);
|
|
#endif /* HAVE_OPENSSL */
|
|
|
|
#ifdef MYSQL_SERVER
|
|
/* sql_do.cc */
|
|
bool mysql_do(THD *thd, List<Item> &values);
|
|
|
|
/* sql_analyse.h */
|
|
bool append_escaped(String *to_str, String *from_str);
|
|
|
|
/* sql_show.cc */
|
|
bool mysqld_show_open_tables(THD *thd,const char *wild);
|
|
bool mysqld_show_logs(THD *thd);
|
|
void append_identifier(THD *thd, String *packet, const char *name,
|
|
uint length);
|
|
int get_quote_char_for_identifier(THD *thd, const char *name, uint length);
|
|
void mysqld_list_fields(THD *thd,TABLE_LIST *table, const char *wild);
|
|
int mysqld_dump_create_info(THD *thd, TABLE_LIST *table_list, int fd);
|
|
bool mysqld_show_create(THD *thd, TABLE_LIST *table_list);
|
|
bool mysqld_show_create_db(THD *thd, char *dbname, HA_CREATE_INFO *create);
|
|
|
|
void mysqld_list_processes(THD *thd,const char *user,bool verbose);
|
|
int mysqld_show_status(THD *thd);
|
|
int mysqld_show_variables(THD *thd,const char *wild);
|
|
bool mysqld_show_storage_engines(THD *thd);
|
|
bool mysqld_show_authors(THD *thd);
|
|
bool mysqld_show_contributors(THD *thd);
|
|
bool mysqld_show_privileges(THD *thd);
|
|
bool mysqld_show_column_types(THD *thd);
|
|
bool mysqld_help (THD *thd, const char *text);
|
|
void calc_sum_of_all_status(STATUS_VAR *to);
|
|
|
|
void append_definer(THD *thd, String *buffer, const LEX_STRING *definer_user,
|
|
const LEX_STRING *definer_host);
|
|
|
|
int add_status_vars(SHOW_VAR *list);
|
|
void remove_status_vars(SHOW_VAR *list);
|
|
void init_status_vars();
|
|
void free_status_vars();
|
|
|
|
/* information schema */
|
|
extern LEX_STRING information_schema_name;
|
|
extern const LEX_STRING partition_keywords[];
|
|
LEX_STRING *make_lex_string(THD *thd, LEX_STRING *lex_str,
|
|
const char* str, uint length,
|
|
bool allocate_lex_string);
|
|
ST_SCHEMA_TABLE *find_schema_table(THD *thd, const char* table_name);
|
|
ST_SCHEMA_TABLE *get_schema_table(enum enum_schema_tables schema_table_idx);
|
|
int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident,
|
|
enum enum_schema_tables schema_table_idx);
|
|
int make_schema_select(THD *thd, SELECT_LEX *sel,
|
|
enum enum_schema_tables schema_table_idx);
|
|
int mysql_schema_table(THD *thd, LEX *lex, TABLE_LIST *table_list);
|
|
int fill_schema_user_privileges(THD *thd, TABLE_LIST *tables, COND *cond);
|
|
int fill_schema_schema_privileges(THD *thd, TABLE_LIST *tables, COND *cond);
|
|
int fill_schema_table_privileges(THD *thd, TABLE_LIST *tables, COND *cond);
|
|
int fill_schema_column_privileges(THD *thd, TABLE_LIST *tables, COND *cond);
|
|
bool get_schema_tables_result(JOIN *join);
|
|
#define is_schema_db(X) \
|
|
!my_strcasecmp(system_charset_info, information_schema_name.str, (X))
|
|
|
|
/* sql_prepare.cc */
|
|
|
|
void mysql_stmt_prepare(THD *thd, const char *packet, uint packet_length);
|
|
void mysql_stmt_execute(THD *thd, char *packet, uint packet_length);
|
|
void mysql_stmt_close(THD *thd, char *packet);
|
|
void mysql_sql_stmt_prepare(THD *thd);
|
|
void mysql_sql_stmt_execute(THD *thd);
|
|
void mysql_sql_stmt_close(THD *thd);
|
|
void mysql_stmt_fetch(THD *thd, char *packet, uint packet_length);
|
|
void mysql_stmt_reset(THD *thd, char *packet);
|
|
void mysql_stmt_get_longdata(THD *thd, char *pos, ulong packet_length);
|
|
void reinit_stmt_before_use(THD *thd, LEX *lex);
|
|
|
|
/* sql_handler.cc */
|
|
bool mysql_ha_open(THD *thd, TABLE_LIST *tables, bool reopen);
|
|
bool mysql_ha_close(THD *thd, TABLE_LIST *tables);
|
|
bool mysql_ha_read(THD *, TABLE_LIST *,enum enum_ha_read_modes,char *,
|
|
List<Item> *,enum ha_rkey_function,Item *,ha_rows,ha_rows);
|
|
int mysql_ha_flush(THD *thd, TABLE_LIST *tables, uint mode_flags,
|
|
bool is_locked);
|
|
void mysql_ha_mark_tables_for_reopen(THD *thd, TABLE *table);
|
|
/* mysql_ha_flush mode_flags bits */
|
|
#define MYSQL_HA_CLOSE_FINAL 0x00
|
|
#define MYSQL_HA_REOPEN_ON_USAGE 0x01
|
|
#define MYSQL_HA_FLUSH_ALL 0x02
|
|
|
|
/* sql_base.cc */
|
|
#define TMP_TABLE_KEY_EXTRA 8
|
|
void set_item_name(Item *item,char *pos,uint length);
|
|
bool add_field_to_list(THD *thd, char *field_name, enum enum_field_types type,
|
|
char *length, char *decimal,
|
|
uint type_modifier,
|
|
Item *default_value, Item *on_update_value,
|
|
LEX_STRING *comment,
|
|
char *change, List<String> *interval_list,
|
|
CHARSET_INFO *cs,
|
|
uint uint_geom_type);
|
|
create_field * new_create_field(THD *thd, char *field_name, enum_field_types type,
|
|
char *length, char *decimals,
|
|
uint type_modifier,
|
|
Item *default_value, Item *on_update_value,
|
|
LEX_STRING *comment, char *change,
|
|
List<String> *interval_list, CHARSET_INFO *cs,
|
|
uint uint_geom_type);
|
|
void store_position_for_column(const char *name);
|
|
bool add_to_list(THD *thd, SQL_LIST &list,Item *group,bool asc);
|
|
bool push_new_name_resolution_context(THD *thd,
|
|
TABLE_LIST *left_op,
|
|
TABLE_LIST *right_op);
|
|
void add_join_on(TABLE_LIST *b,Item *expr);
|
|
void add_join_natural(TABLE_LIST *a,TABLE_LIST *b,List<String> *using_fields);
|
|
bool add_proc_to_list(THD *thd, Item *item);
|
|
TABLE *unlink_open_table(THD *thd,TABLE *list,TABLE *find);
|
|
void update_non_unique_table_error(TABLE_LIST *update,
|
|
const char *operation,
|
|
TABLE_LIST *duplicate);
|
|
|
|
SQL_SELECT *make_select(TABLE *head, table_map const_tables,
|
|
table_map read_tables, COND *conds,
|
|
bool allow_null_cond, int *error);
|
|
extern Item **not_found_item;
|
|
Item ** find_item_in_list(Item *item, List<Item> &items, uint *counter,
|
|
find_item_error_report_type report_error,
|
|
bool *unaliased);
|
|
bool get_key_map_from_key_list(key_map *map, TABLE *table,
|
|
List<String> *index_list);
|
|
bool insert_fields(THD *thd, Name_resolution_context *context,
|
|
const char *db_name, const char *table_name,
|
|
List_iterator<Item> *it, bool any_privileges);
|
|
bool setup_tables(THD *thd, Name_resolution_context *context,
|
|
List<TABLE_LIST> *from_clause, TABLE_LIST *tables,
|
|
TABLE_LIST **leaves, bool select_insert);
|
|
bool setup_tables_and_check_access(THD *thd,
|
|
Name_resolution_context *context,
|
|
List<TABLE_LIST> *from_clause,
|
|
TABLE_LIST *tables,
|
|
TABLE_LIST **leaves,
|
|
bool select_insert,
|
|
ulong want_access_first,
|
|
ulong want_access);
|
|
int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
|
|
List<Item> *sum_func_list, uint wild_num);
|
|
bool setup_fields(THD *thd, Item** ref_pointer_array,
|
|
List<Item> &item, enum_mark_columns mark_used_columns,
|
|
List<Item> *sum_func_list, bool allow_sum_func);
|
|
inline bool setup_fields_with_no_wrap(THD *thd, Item **ref_pointer_array,
|
|
List<Item> &item,
|
|
enum_mark_columns mark_used_columns,
|
|
List<Item> *sum_func_list,
|
|
bool allow_sum_func)
|
|
{
|
|
bool res;
|
|
thd->lex->select_lex.no_wrap_view_item= TRUE;
|
|
res= setup_fields(thd, ref_pointer_array, item, mark_used_columns, sum_func_list,
|
|
allow_sum_func);
|
|
thd->lex->select_lex.no_wrap_view_item= FALSE;
|
|
return res;
|
|
}
|
|
int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves,
|
|
COND **conds);
|
|
int setup_ftfuncs(SELECT_LEX* select);
|
|
int init_ftfuncs(THD *thd, SELECT_LEX* select, bool no_order);
|
|
void wait_for_condition(THD *thd, pthread_mutex_t *mutex,
|
|
pthread_cond_t *cond);
|
|
int open_tables(THD *thd, TABLE_LIST **tables, uint *counter, uint flags);
|
|
int simple_open_n_lock_tables(THD *thd,TABLE_LIST *tables);
|
|
bool open_and_lock_tables(THD *thd,TABLE_LIST *tables);
|
|
bool open_normal_and_derived_tables(THD *thd, TABLE_LIST *tables, uint flags);
|
|
int lock_tables(THD *thd, TABLE_LIST *tables, uint counter, bool *need_reopen);
|
|
TABLE *open_temporary_table(THD *thd, const char *path, const char *db,
|
|
const char *table_name, bool link_in_list);
|
|
bool rm_temporary_table(handlerton *base, char *path);
|
|
void free_io_cache(TABLE *entry);
|
|
void intern_close_table(TABLE *entry);
|
|
bool close_thread_table(THD *thd, TABLE **table_ptr);
|
|
void close_temporary_tables(THD *thd);
|
|
void close_tables_for_reopen(THD *thd, TABLE_LIST **tables);
|
|
TABLE_LIST *find_table_in_list(TABLE_LIST *table,
|
|
st_table_list *TABLE_LIST::*link,
|
|
const char *db_name,
|
|
const char *table_name);
|
|
TABLE_LIST *unique_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list);
|
|
TABLE *find_temporary_table(THD *thd, const char *db, const char *table_name);
|
|
TABLE *find_temporary_table(THD *thd, TABLE_LIST *table_list);
|
|
bool close_temporary_table(THD *thd, TABLE_LIST *table_list);
|
|
void close_temporary_table(THD *thd, TABLE *table, bool free_share,
|
|
bool delete_table);
|
|
void close_temporary(TABLE *table, bool free_share, bool delete_table);
|
|
bool rename_temporary_table(THD* thd, TABLE *table, const char *new_db,
|
|
const char *table_name);
|
|
void remove_db_from_cache(const char *db);
|
|
void flush_tables();
|
|
bool is_equal(const LEX_STRING *a, const LEX_STRING *b);
|
|
char *make_default_log_name(char *buff,const char* log_ext);
|
|
|
|
#ifdef WITH_PARTITION_STORAGE_ENGINE
|
|
uint fast_alter_partition_table(THD *thd, TABLE *table,
|
|
ALTER_INFO *alter_info,
|
|
HA_CREATE_INFO *create_info,
|
|
TABLE_LIST *table_list,
|
|
List<create_field> *create_list,
|
|
List<Key> *key_list, char *db,
|
|
const char *table_name,
|
|
uint fast_alter_partition);
|
|
uint prep_alter_part_table(THD *thd, TABLE *table, ALTER_INFO *alter_info,
|
|
HA_CREATE_INFO *create_info,
|
|
handlerton *old_db_type,
|
|
bool *partition_changed,
|
|
uint *fast_alter_partition);
|
|
#endif
|
|
|
|
/* bits for last argument to remove_table_from_cache() */
|
|
#define RTFC_NO_FLAG 0x0000
|
|
#define RTFC_OWNED_BY_THD_FLAG 0x0001
|
|
#define RTFC_WAIT_OTHER_THREAD_FLAG 0x0002
|
|
#define RTFC_CHECK_KILLED_FLAG 0x0004
|
|
bool remove_table_from_cache(THD *thd, const char *db, const char *table,
|
|
uint flags);
|
|
|
|
#define NORMAL_PART_NAME 0
|
|
#define TEMP_PART_NAME 1
|
|
#define RENAMED_PART_NAME 2
|
|
void create_partition_name(char *out, const char *in1,
|
|
const char *in2, uint name_variant,
|
|
bool translate);
|
|
void create_subpartition_name(char *out, const char *in1,
|
|
const char *in2, const char *in3,
|
|
uint name_variant);
|
|
|
|
typedef struct st_lock_param_type
|
|
{
|
|
TABLE_LIST table_list;
|
|
ulonglong copied;
|
|
ulonglong deleted;
|
|
THD *thd;
|
|
HA_CREATE_INFO *create_info;
|
|
ALTER_INFO *alter_info;
|
|
List<create_field> *create_list;
|
|
List<create_field> new_create_list;
|
|
List<Key> *key_list;
|
|
List<Key> new_key_list;
|
|
TABLE *table;
|
|
KEY *key_info_buffer;
|
|
const char *db;
|
|
const char *table_name;
|
|
const void *pack_frm_data;
|
|
enum thr_lock_type old_lock_type;
|
|
uint key_count;
|
|
uint db_options;
|
|
uint pack_frm_len;
|
|
partition_info *part_info;
|
|
} ALTER_PARTITION_PARAM_TYPE;
|
|
|
|
void mem_alloc_error(size_t size);
|
|
|
|
enum ddl_log_entry_code
|
|
{
|
|
/*
|
|
DDL_LOG_EXECUTE_CODE:
|
|
This is a code that indicates that this is a log entry to
|
|
be executed, from this entry a linked list of log entries
|
|
can be found and executed.
|
|
DDL_LOG_ENTRY_CODE:
|
|
An entry to be executed in a linked list from an execute log
|
|
entry.
|
|
DDL_IGNORE_LOG_ENTRY_CODE:
|
|
An entry that is to be ignored
|
|
*/
|
|
DDL_LOG_EXECUTE_CODE = 'e',
|
|
DDL_LOG_ENTRY_CODE = 'l',
|
|
DDL_IGNORE_LOG_ENTRY_CODE = 'i'
|
|
};
|
|
|
|
enum ddl_log_action_code
|
|
{
|
|
/*
|
|
The type of action that a DDL_LOG_ENTRY_CODE entry is to
|
|
perform.
|
|
DDL_LOG_DELETE_ACTION:
|
|
Delete an entity
|
|
DDL_LOG_RENAME_ACTION:
|
|
Rename an entity
|
|
DDL_LOG_REPLACE_ACTION:
|
|
Rename an entity after removing the previous entry with the
|
|
new name, that is replace this entry.
|
|
*/
|
|
DDL_LOG_DELETE_ACTION = 'd',
|
|
DDL_LOG_RENAME_ACTION = 'r',
|
|
DDL_LOG_REPLACE_ACTION = 's'
|
|
};
|
|
|
|
|
|
typedef struct st_ddl_log_entry
|
|
{
|
|
const char *name;
|
|
const char *from_name;
|
|
const char *handler_name;
|
|
uint next_entry;
|
|
uint entry_pos;
|
|
enum ddl_log_entry_code entry_type;
|
|
enum ddl_log_action_code action_type;
|
|
/*
|
|
Most actions have only one phase. REPLACE does however have two
|
|
phases. The first phase removes the file with the new name if
|
|
there was one there before and the second phase renames the
|
|
old name to the new name.
|
|
*/
|
|
char phase;
|
|
} DDL_LOG_ENTRY;
|
|
|
|
typedef struct st_ddl_log_memory_entry
|
|
{
|
|
uint entry_pos;
|
|
struct st_ddl_log_memory_entry *next_log_entry;
|
|
struct st_ddl_log_memory_entry *prev_log_entry;
|
|
struct st_ddl_log_memory_entry *next_active_log_entry;
|
|
} DDL_LOG_MEMORY_ENTRY;
|
|
|
|
|
|
bool write_ddl_log_entry(DDL_LOG_ENTRY *ddl_log_entry,
|
|
DDL_LOG_MEMORY_ENTRY **active_entry);
|
|
bool write_execute_ddl_log_entry(uint first_entry,
|
|
bool complete,
|
|
DDL_LOG_MEMORY_ENTRY **active_entry);
|
|
bool deactivate_ddl_log_entry(uint entry_no);
|
|
void release_ddl_log_memory_entry(DDL_LOG_MEMORY_ENTRY *log_entry);
|
|
bool sync_ddl_log();
|
|
void release_ddl_log();
|
|
void execute_ddl_log_recovery();
|
|
bool execute_ddl_log_entry(THD *thd, uint first_entry);
|
|
|
|
extern pthread_mutex_t LOCK_gdl;
|
|
|
|
#define WFRM_WRITE_SHADOW 1
|
|
#define WFRM_INSTALL_SHADOW 2
|
|
#define WFRM_PACK_FRM 4
|
|
bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags);
|
|
int abort_and_upgrade_lock(ALTER_PARTITION_PARAM_TYPE *lpt);
|
|
void close_open_tables_and_downgrade(ALTER_PARTITION_PARAM_TYPE *lpt);
|
|
void mysql_wait_completed_table(ALTER_PARTITION_PARAM_TYPE *lpt, TABLE *my_table);
|
|
|
|
bool close_cached_tables(THD *thd, bool wait_for_refresh, TABLE_LIST *tables, bool have_lock = FALSE);
|
|
void copy_field_from_tmp_record(Field *field,int offset);
|
|
bool fill_record(THD *thd, Field **field, List<Item> &values,
|
|
bool ignore_errors);
|
|
bool fill_record_n_invoke_before_triggers(THD *thd, List<Item> &fields,
|
|
List<Item> &values,
|
|
bool ignore_errors,
|
|
Table_triggers_list *triggers,
|
|
enum trg_event_type event);
|
|
bool fill_record_n_invoke_before_triggers(THD *thd, Field **field,
|
|
List<Item> &values,
|
|
bool ignore_errors,
|
|
Table_triggers_list *triggers,
|
|
enum trg_event_type event);
|
|
OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *db, const char *wild);
|
|
|
|
inline TABLE_LIST *find_table_in_global_list(TABLE_LIST *table,
|
|
const char *db_name,
|
|
const char *table_name)
|
|
{
|
|
return find_table_in_list(table, &TABLE_LIST::next_global,
|
|
db_name, table_name);
|
|
}
|
|
|
|
inline TABLE_LIST *find_table_in_local_list(TABLE_LIST *table,
|
|
const char *db_name,
|
|
const char *table_name)
|
|
{
|
|
return find_table_in_list(table, &TABLE_LIST::next_local,
|
|
db_name, table_name);
|
|
}
|
|
|
|
|
|
/* sql_calc.cc */
|
|
bool eval_const_cond(COND *cond);
|
|
|
|
/* sql_load.cc */
|
|
bool mysql_load(THD *thd, sql_exchange *ex, TABLE_LIST *table_list,
|
|
List<Item> &fields_vars, List<Item> &set_fields,
|
|
List<Item> &set_values_list,
|
|
enum enum_duplicates handle_duplicates, bool ignore,
|
|
bool local_file);
|
|
int write_record(THD *thd, TABLE *table, COPY_INFO *info);
|
|
|
|
/* sql_manager.cc */
|
|
extern ulong volatile manager_status;
|
|
extern bool volatile manager_thread_in_use, mqh_used;
|
|
extern pthread_t manager_thread;
|
|
pthread_handler_t handle_manager(void *arg);
|
|
bool mysql_manager_submit(void (*action)());
|
|
|
|
|
|
/* sql_test.cc */
|
|
#ifndef DBUG_OFF
|
|
void print_where(COND *cond,const char *info);
|
|
void print_cached_tables(void);
|
|
void TEST_filesort(SORT_FIELD *sortorder,uint s_length);
|
|
void print_plan(JOIN* join,uint idx, double record_count, double read_time,
|
|
double current_read_time, const char *info);
|
|
#endif
|
|
void mysql_print_status();
|
|
/* key.cc */
|
|
int find_ref_key(KEY *key, uint key_count, byte *record, Field *field,
|
|
uint *key_length);
|
|
void key_copy(byte *to_key, byte *from_record, KEY *key_info, uint key_length);
|
|
void key_restore(byte *to_record, byte *from_key, KEY *key_info,
|
|
uint key_length);
|
|
bool key_cmp_if_same(TABLE *form,const byte *key,uint index,uint key_length);
|
|
void key_unpack(String *to,TABLE *form,uint index);
|
|
bool is_key_used(TABLE *table, uint idx, const MY_BITMAP *fields);
|
|
int key_cmp(KEY_PART_INFO *key_part, const byte *key, uint key_length);
|
|
int key_rec_cmp(void *key_info, byte *a, byte *b);
|
|
|
|
bool init_errmessage(void);
|
|
#endif /* MYSQL_SERVER */
|
|
void sql_perror(const char *message);
|
|
|
|
|
|
int vprint_msg_to_log(enum loglevel level, const char *format, va_list args);
|
|
void sql_print_error(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
|
|
void sql_print_warning(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2);
|
|
void sql_print_information(const char *format, ...)
|
|
ATTRIBUTE_FORMAT(printf, 1, 2);
|
|
typedef void (*sql_print_message_func)(const char *format, ...)
|
|
ATTRIBUTE_FORMAT(printf, 1, 2);
|
|
extern sql_print_message_func sql_print_message_handlers[];
|
|
|
|
int error_log_print(enum loglevel level, const char *format,
|
|
va_list args);
|
|
|
|
bool slow_log_print(THD *thd, const char *query, uint query_length,
|
|
time_t query_start_arg);
|
|
|
|
bool general_log_print(THD *thd, enum enum_server_command command,
|
|
const char *format,...);
|
|
|
|
bool fn_format_relative_to_data_home(my_string to, const char *name,
|
|
const char *dir, const char *extension);
|
|
#ifdef MYSQL_SERVER
|
|
File open_binlog(IO_CACHE *log, const char *log_file_name,
|
|
const char **errmsg);
|
|
|
|
/* mysqld.cc */
|
|
extern void MYSQLerror(const char*);
|
|
void refresh_status(THD *thd);
|
|
|
|
/* item_func.cc */
|
|
extern bool check_reserved_words(LEX_STRING *name);
|
|
|
|
/* strfunc.cc */
|
|
ulonglong find_set(TYPELIB *lib, const char *x, uint length, CHARSET_INFO *cs,
|
|
char **err_pos, uint *err_len, bool *set_warning);
|
|
uint find_type(TYPELIB *lib, const char *find, uint length, bool part_match);
|
|
uint find_type2(TYPELIB *lib, const char *find, uint length, CHARSET_INFO *cs);
|
|
void unhex_type2(TYPELIB *lib);
|
|
uint check_word(TYPELIB *lib, const char *val, const char *end,
|
|
const char **end_of_word);
|
|
int find_string_in_array(LEX_STRING * const haystack, LEX_STRING * const needle,
|
|
CHARSET_INFO * const cs);
|
|
|
|
|
|
bool is_keyword(const char *name, uint len);
|
|
|
|
#define MY_DB_OPT_FILE "db.opt"
|
|
bool my_database_names_init(void);
|
|
void my_database_names_free(void);
|
|
bool check_db_dir_existence(const char *db_name);
|
|
bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create);
|
|
bool load_db_opt_by_name(THD *thd, const char *db_name,
|
|
HA_CREATE_INFO *db_create_info);
|
|
bool my_dbopt_init(void);
|
|
void my_dbopt_cleanup(void);
|
|
extern int creating_database; // How many database locks are made
|
|
extern int creating_table; // How many mysql_create_table() are running
|
|
|
|
/*
|
|
External variables
|
|
*/
|
|
|
|
extern time_t start_time;
|
|
extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH],
|
|
mysql_real_data_home[], *opt_mysql_tmpdir, mysql_charsets_dir[],
|
|
def_ft_boolean_syntax[sizeof(ft_boolean_syntax)];
|
|
#define mysql_tmpdir (my_tmpdir(&mysql_tmpdir_list))
|
|
extern MY_TMPDIR mysql_tmpdir_list;
|
|
extern const LEX_STRING command_name[];
|
|
extern const char *first_keyword, *my_localhost, *delayed_user, *binary_keyword;
|
|
extern const char **errmesg; /* Error messages */
|
|
extern const char *myisam_recover_options_str;
|
|
extern const char *in_left_expr_name, *in_additional_cond;
|
|
extern const char * const triggers_file_ext;
|
|
extern const char * const trigname_file_ext;
|
|
extern Eq_creator eq_creator;
|
|
extern Ne_creator ne_creator;
|
|
extern Gt_creator gt_creator;
|
|
extern Lt_creator lt_creator;
|
|
extern Ge_creator ge_creator;
|
|
extern Le_creator le_creator;
|
|
extern char language[FN_REFLEN], reg_ext[FN_EXTLEN];
|
|
extern uint reg_ext_length;
|
|
extern char glob_hostname[FN_REFLEN], mysql_home[FN_REFLEN];
|
|
extern char pidfile_name[FN_REFLEN], system_time_zone[30], *opt_init_file;
|
|
extern char log_error_file[FN_REFLEN], *opt_tc_log_file;
|
|
extern double log_10[32];
|
|
extern ulonglong log_10_int[20];
|
|
extern ulonglong keybuff_size;
|
|
extern ulonglong thd_startup_options;
|
|
extern ulong refresh_version,flush_version, thread_id;
|
|
extern ulong binlog_cache_use, binlog_cache_disk_use;
|
|
extern ulong aborted_threads,aborted_connects;
|
|
extern ulong delayed_insert_timeout;
|
|
extern ulong delayed_insert_limit, delayed_queue_size;
|
|
extern ulong delayed_insert_threads, delayed_insert_writes;
|
|
extern ulong delayed_rows_in_use,delayed_insert_errors;
|
|
extern ulong slave_open_temp_tables;
|
|
extern ulong query_cache_size, query_cache_min_res_unit;
|
|
extern ulong slow_launch_threads, slow_launch_time;
|
|
extern ulong table_cache_size, table_def_size;
|
|
extern ulong max_connections,max_connect_errors, connect_timeout;
|
|
extern ulong slave_net_timeout, slave_trans_retries;
|
|
extern uint max_user_connections;
|
|
extern ulong what_to_log,flush_time;
|
|
extern ulong query_buff_size, thread_stack;
|
|
extern ulong max_prepared_stmt_count, prepared_stmt_count;
|
|
extern ulong binlog_cache_size, max_binlog_cache_size, open_files_limit;
|
|
extern ulong max_binlog_size, max_relay_log_size;
|
|
#ifdef HAVE_ROW_BASED_REPLICATION
|
|
extern ulong opt_binlog_rows_event_max_size;
|
|
#endif
|
|
extern ulong rpl_recovery_rank, thread_cache_size;
|
|
extern ulong back_log;
|
|
extern ulong specialflag, current_pid;
|
|
extern ulong expire_logs_days, sync_binlog_period, sync_binlog_counter;
|
|
extern ulong opt_tc_log_size, tc_log_max_pages_used, tc_log_page_size;
|
|
extern ulong tc_log_page_waits;
|
|
extern my_bool relay_log_purge, opt_innodb_safe_binlog, opt_innodb;
|
|
extern uint test_flags,select_errors,ha_open_options;
|
|
extern uint protocol_version, mysqld_port, dropping_tables;
|
|
extern uint delay_key_write_options, lower_case_table_names;
|
|
extern bool opt_endinfo, using_udf_functions;
|
|
extern my_bool locked_in_memory;
|
|
extern bool opt_using_transactions, mysqld_embedded;
|
|
extern bool using_update_log, opt_large_files, server_id_supplied;
|
|
extern bool opt_update_log, opt_bin_log, opt_error_log;
|
|
extern my_bool opt_log, opt_slow_log;
|
|
extern ulong log_output_options;
|
|
extern my_bool opt_log_queries_not_using_indexes;
|
|
extern bool opt_disable_networking, opt_skip_show_db;
|
|
extern my_bool opt_character_set_client_handshake;
|
|
extern bool volatile abort_loop, shutdown_in_progress, grant_option;
|
|
extern uint volatile thread_count, thread_running, global_read_lock;
|
|
extern my_bool opt_sql_bin_update, opt_safe_user_create, opt_no_mix_types;
|
|
extern my_bool opt_safe_show_db, opt_local_infile, opt_myisam_use_mmap;
|
|
extern my_bool opt_slave_compressed_protocol, use_temp_pool;
|
|
extern my_bool opt_readonly, lower_case_file_system;
|
|
extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs;
|
|
extern my_bool opt_secure_auth;
|
|
extern my_bool opt_log_slow_admin_statements;
|
|
extern my_bool sp_automatic_privileges, opt_noacl;
|
|
extern my_bool opt_old_style_user_limits, trust_function_creators;
|
|
extern uint opt_crash_binlog_innodb;
|
|
extern char *shared_memory_base_name, *mysqld_unix_port;
|
|
extern my_bool opt_enable_shared_memory;
|
|
extern char *default_tz_name;
|
|
extern my_bool opt_large_pages;
|
|
extern uint opt_large_page_size;
|
|
extern char *opt_logname, *opt_slow_logname;
|
|
extern const char *log_output_str;
|
|
|
|
extern MYSQL_BIN_LOG mysql_bin_log;
|
|
extern LOGGER logger;
|
|
extern TABLE_LIST general_log, slow_log;
|
|
extern FILE *bootstrap_file;
|
|
extern int bootstrap_error;
|
|
extern FILE *stderror_file;
|
|
extern pthread_key(MEM_ROOT**,THR_MALLOC);
|
|
extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open, LOCK_lock_db,
|
|
LOCK_thread_count,LOCK_mapped_file,LOCK_user_locks, LOCK_status,
|
|
LOCK_error_log, LOCK_delayed_insert, LOCK_uuid_generator,
|
|
LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone,
|
|
LOCK_slave_list, LOCK_active_mi, LOCK_manager, LOCK_global_read_lock,
|
|
LOCK_global_system_variables, LOCK_user_conn,
|
|
LOCK_prepared_stmt_count,
|
|
LOCK_bytes_sent, LOCK_bytes_received;
|
|
#ifdef HAVE_OPENSSL
|
|
extern pthread_mutex_t LOCK_des_key_file;
|
|
#endif
|
|
extern pthread_mutex_t LOCK_server_started;
|
|
extern pthread_cond_t COND_server_started;
|
|
extern int mysqld_server_started;
|
|
extern rw_lock_t LOCK_grant, LOCK_sys_init_connect, LOCK_sys_init_slave;
|
|
extern pthread_cond_t COND_refresh, COND_thread_count, COND_manager;
|
|
extern pthread_cond_t COND_global_read_lock;
|
|
extern pthread_attr_t connection_attrib;
|
|
extern I_List<THD> threads;
|
|
extern I_List<NAMED_LIST> key_caches;
|
|
extern MY_BITMAP temp_pool;
|
|
extern String my_empty_string;
|
|
extern const String my_null_string;
|
|
extern SHOW_VAR init_vars[], status_vars[], internal_vars[];
|
|
extern struct system_variables global_system_variables;
|
|
extern struct system_variables max_system_variables;
|
|
extern struct system_status_var global_status_var;
|
|
extern struct rand_struct sql_rand;
|
|
|
|
extern const char *opt_date_time_formats[];
|
|
extern KNOWN_DATE_TIME_FORMAT known_date_time_formats[];
|
|
|
|
extern String null_string;
|
|
extern HASH open_cache, lock_db_cache;
|
|
extern TABLE *unused_tables;
|
|
extern const char* any_db;
|
|
extern struct my_option my_long_options[];
|
|
extern const LEX_STRING view_type;
|
|
extern uint sql_command_flags[];
|
|
extern TYPELIB log_output_typelib;
|
|
|
|
/* optional things, have_* variables */
|
|
|
|
extern SHOW_COMP_OPTION have_innodb;
|
|
extern SHOW_COMP_OPTION have_csv_db;
|
|
extern SHOW_COMP_OPTION have_ndbcluster;
|
|
extern SHOW_COMP_OPTION have_partition_db;
|
|
|
|
extern handlerton *partition_hton;
|
|
extern handlerton *myisam_hton;
|
|
extern handlerton *heap_hton;
|
|
|
|
extern SHOW_COMP_OPTION have_row_based_replication;
|
|
extern SHOW_COMP_OPTION have_openssl, have_symlink, have_dlopen;
|
|
extern SHOW_COMP_OPTION have_query_cache;
|
|
extern SHOW_COMP_OPTION have_geometry, have_rtree_keys;
|
|
extern SHOW_COMP_OPTION have_crypt;
|
|
extern SHOW_COMP_OPTION have_compress;
|
|
|
|
#ifndef __WIN__
|
|
extern pthread_t signal_thread;
|
|
#endif
|
|
|
|
#ifdef HAVE_OPENSSL
|
|
extern struct st_VioSSLFd * ssl_acceptor_fd;
|
|
#endif /* HAVE_OPENSSL */
|
|
|
|
MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **table, uint count,
|
|
uint flags, bool *need_reopen);
|
|
/* mysql_lock_tables() and open_table() flags bits */
|
|
#define MYSQL_LOCK_IGNORE_GLOBAL_READ_LOCK 0x0001
|
|
#define MYSQL_LOCK_IGNORE_FLUSH 0x0002
|
|
#define MYSQL_LOCK_NOTIFY_IF_NEED_REOPEN 0x0004
|
|
#define MYSQL_OPEN_IGNORE_LOCKED_TABLES 0x0008
|
|
|
|
void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock);
|
|
void mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock);
|
|
void mysql_unlock_some_tables(THD *thd, TABLE **table,uint count);
|
|
void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table);
|
|
void mysql_lock_abort(THD *thd, TABLE *table, bool upgrade_lock);
|
|
void mysql_lock_downgrade_write(THD *thd, TABLE *table,
|
|
thr_lock_type new_lock_type);
|
|
bool mysql_lock_abort_for_thread(THD *thd, TABLE *table);
|
|
MYSQL_LOCK *mysql_lock_merge(MYSQL_LOCK *a,MYSQL_LOCK *b);
|
|
TABLE_LIST *mysql_lock_have_duplicate(THD *thd, TABLE_LIST *needle,
|
|
TABLE_LIST *haystack);
|
|
bool lock_global_read_lock(THD *thd);
|
|
void unlock_global_read_lock(THD *thd);
|
|
bool wait_if_global_read_lock(THD *thd, bool abort_on_refresh,
|
|
bool is_not_commit);
|
|
void start_waiting_global_read_lock(THD *thd);
|
|
bool make_global_read_lock_block_commit(THD *thd);
|
|
bool set_protect_against_global_read_lock(void);
|
|
void unset_protect_against_global_read_lock(void);
|
|
void broadcast_refresh(void);
|
|
|
|
/* Lock based on name */
|
|
int lock_and_wait_for_table_name(THD *thd, TABLE_LIST *table_list);
|
|
int lock_table_name(THD *thd, TABLE_LIST *table_list, bool check_in_use);
|
|
void unlock_table_name(THD *thd, TABLE_LIST *table_list);
|
|
bool wait_for_locked_table_names(THD *thd, TABLE_LIST *table_list);
|
|
bool lock_table_names(THD *thd, TABLE_LIST *table_list);
|
|
void unlock_table_names(THD *thd, TABLE_LIST *table_list,
|
|
TABLE_LIST *last_table);
|
|
|
|
|
|
/* old unireg functions */
|
|
|
|
void unireg_init(ulong options);
|
|
void unireg_end(void) __attribute__((noreturn));
|
|
bool mysql_create_frm(THD *thd, const char *file_name,
|
|
const char *db, const char *table,
|
|
HA_CREATE_INFO *create_info,
|
|
List<create_field> &create_field,
|
|
uint key_count,KEY *key_info,handler *db_type);
|
|
int rea_create_table(THD *thd, const char *path,
|
|
const char *db, const char *table_name,
|
|
HA_CREATE_INFO *create_info,
|
|
List<create_field> &create_field,
|
|
uint key_count,KEY *key_info,
|
|
handler *file);
|
|
int format_number(uint inputflag,uint max_length,my_string pos,uint length,
|
|
my_string *errpos);
|
|
|
|
/* table.cc */
|
|
TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, char *key,
|
|
uint key_length);
|
|
void init_tmp_table_share(TABLE_SHARE *share, const char *key, uint key_length,
|
|
const char *table_name, const char *path);
|
|
void free_table_share(TABLE_SHARE *share);
|
|
int open_table_def(THD *thd, TABLE_SHARE *share, uint db_flags);
|
|
void open_table_error(TABLE_SHARE *share, int error, int db_errno, int errarg);
|
|
int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
|
|
uint db_stat, uint prgflag, uint ha_open_flags,
|
|
TABLE *outparam, bool is_create_table);
|
|
int readfrm(const char *name, const void** data, uint* length);
|
|
int writefrm(const char* name, const void* data, uint len);
|
|
int closefrm(TABLE *table, bool free_share);
|
|
int read_string(File file, gptr *to, uint length);
|
|
void free_blobs(TABLE *table);
|
|
int set_zone(int nr,int min_zone,int max_zone);
|
|
ulong convert_period_to_month(ulong period);
|
|
ulong convert_month_to_period(ulong month);
|
|
void get_date_from_daynr(long daynr,uint *year, uint *month,
|
|
uint *day);
|
|
my_time_t TIME_to_timestamp(THD *thd, const TIME *t, my_bool *not_exist);
|
|
bool str_to_time_with_warn(const char *str,uint length,TIME *l_time);
|
|
timestamp_type str_to_datetime_with_warn(const char *str, uint length,
|
|
TIME *l_time, uint flags);
|
|
void localtime_to_TIME(TIME *to, struct tm *from);
|
|
void calc_time_from_sec(TIME *to, long seconds, long microseconds);
|
|
|
|
void make_truncated_value_warning(THD *thd, const char *str_val,
|
|
uint str_length, timestamp_type time_type,
|
|
const char *field_name);
|
|
|
|
bool date_add_interval(TIME *ltime, interval_type int_type, INTERVAL interval);
|
|
bool calc_time_diff(TIME *l_time1, TIME *l_time2, int l_sign,
|
|
longlong *seconds_out, long *microseconds_out);
|
|
|
|
extern LEX_STRING interval_type_to_name[];
|
|
|
|
extern DATE_TIME_FORMAT *date_time_format_make(timestamp_type format_type,
|
|
const char *format_str,
|
|
uint format_length);
|
|
extern DATE_TIME_FORMAT *date_time_format_copy(THD *thd,
|
|
DATE_TIME_FORMAT *format);
|
|
const char *get_date_time_format_str(KNOWN_DATE_TIME_FORMAT *format,
|
|
timestamp_type type);
|
|
extern bool make_date_time(DATE_TIME_FORMAT *format, TIME *l_time,
|
|
timestamp_type type, String *str);
|
|
void make_datetime(const DATE_TIME_FORMAT *format, const TIME *l_time,
|
|
String *str);
|
|
void make_date(const DATE_TIME_FORMAT *format, const TIME *l_time,
|
|
String *str);
|
|
void make_time(const DATE_TIME_FORMAT *format, const TIME *l_time,
|
|
String *str);
|
|
int my_time_compare(TIME *a, TIME *b);
|
|
|
|
int test_if_number(char *str,int *res,bool allow_wildcards);
|
|
void change_byte(byte *,uint,char,char);
|
|
void init_read_record(READ_RECORD *info, THD *thd, TABLE *reg_form,
|
|
SQL_SELECT *select,
|
|
int use_record_cache, bool print_errors);
|
|
void init_read_record_idx(READ_RECORD *info, THD *thd, TABLE *table,
|
|
bool print_error, uint idx);
|
|
void end_read_record(READ_RECORD *info);
|
|
ha_rows filesort(THD *thd, TABLE *form,struct st_sort_field *sortorder,
|
|
uint s_length, SQL_SELECT *select,
|
|
ha_rows max_rows, bool sort_positions,
|
|
ha_rows *examined_rows);
|
|
void filesort_free_buffers(TABLE *table, bool full);
|
|
void change_double_for_sort(double nr,byte *to);
|
|
double my_double_round(double value, int dec, bool truncate);
|
|
int get_quick_record(SQL_SELECT *select);
|
|
|
|
int calc_weekday(long daynr,bool sunday_first_day_of_week);
|
|
uint calc_week(TIME *l_time, uint week_behaviour, uint *year);
|
|
void find_date(char *pos,uint *vek,uint flag);
|
|
TYPELIB *convert_strings_to_array_type(my_string *typelibs, my_string *end);
|
|
TYPELIB *typelib(MEM_ROOT *mem_root, List<String> &strings);
|
|
ulong get_form_pos(File file, uchar *head, TYPELIB *save_names);
|
|
ulong make_new_entry(File file,uchar *fileinfo,TYPELIB *formnames,
|
|
const char *newname);
|
|
ulong next_io_size(ulong pos);
|
|
void append_unescaped(String *res, const char *pos, uint length);
|
|
int create_frm(THD *thd, const char *name, const char *db, const char *table,
|
|
uint reclength, uchar *fileinfo,
|
|
HA_CREATE_INFO *create_info, uint keys);
|
|
void update_create_info_from_table(HA_CREATE_INFO *info, TABLE *form);
|
|
int rename_file_ext(const char * from,const char * to,const char * ext);
|
|
bool check_db_name(LEX_STRING *db);
|
|
bool check_column_name(const char *name);
|
|
bool check_table_name(const char *name, uint length);
|
|
char *get_field(MEM_ROOT *mem, Field *field);
|
|
bool get_field(MEM_ROOT *mem, Field *field, class String *res);
|
|
int wild_case_compare(CHARSET_INFO *cs, const char *str,const char *wildstr);
|
|
char *fn_rext(char *name);
|
|
|
|
/* Conversion functions */
|
|
uint strconvert(CHARSET_INFO *from_cs, const char *from,
|
|
CHARSET_INFO *to_cs, char *to, uint to_length, uint *errors);
|
|
uint filename_to_tablename(const char *from, char *to, uint to_length);
|
|
uint tablename_to_filename(const char *from, char *to, uint to_length);
|
|
uint build_table_filename(char *buff, size_t bufflen, const char *db,
|
|
const char *table, const char *ext, uint flags);
|
|
/* Flags for conversion functions. */
|
|
#define FN_FROM_IS_TMP (1 << 0)
|
|
#define FN_TO_IS_TMP (1 << 1)
|
|
#define FN_IS_TMP (FN_FROM_IS_TMP | FN_TO_IS_TMP)
|
|
#define NO_FRM_RENAME (1 << 2)
|
|
|
|
/* from hostname.cc */
|
|
struct in_addr;
|
|
my_string ip_to_hostname(struct in_addr *in,uint *errors);
|
|
void inc_host_errors(struct in_addr *in);
|
|
void reset_host_errors(struct in_addr *in);
|
|
bool hostname_cache_init();
|
|
void hostname_cache_free();
|
|
void hostname_cache_refresh(void);
|
|
|
|
/* sql_cache.cc */
|
|
extern bool sql_cache_init();
|
|
extern void sql_cache_free();
|
|
extern int sql_cache_hit(THD *thd, char *inBuf, uint length);
|
|
|
|
/* item_func.cc */
|
|
Item *get_system_var(THD *thd, enum_var_type var_type, LEX_STRING name,
|
|
LEX_STRING component);
|
|
int get_var_with_binlog(THD *thd, enum_sql_command sql_command,
|
|
LEX_STRING &name, user_var_entry **out_entry);
|
|
/* log.cc */
|
|
bool flush_error_log(void);
|
|
|
|
/* sql_list.cc */
|
|
void free_list(I_List <i_string_pair> *list);
|
|
void free_list(I_List <i_string> *list);
|
|
|
|
/* sql_yacc.cc */
|
|
extern int MYSQLparse(void *thd);
|
|
#ifndef DBUG_OFF
|
|
extern void turn_parser_debug_on();
|
|
#endif
|
|
|
|
/* frm_crypt.cc */
|
|
#ifdef HAVE_CRYPTED_FRM
|
|
SQL_CRYPT *get_crypt_for_frm(void);
|
|
#endif
|
|
|
|
#include "sql_view.h"
|
|
|
|
/* Some inline functions for more speed */
|
|
|
|
inline bool add_item_to_list(THD *thd, Item *item)
|
|
{
|
|
return thd->lex->current_select->add_item_to_list(thd, item);
|
|
}
|
|
|
|
inline bool add_value_to_list(THD *thd, Item *value)
|
|
{
|
|
return thd->lex->value_list.push_back(value);
|
|
}
|
|
|
|
inline bool add_order_to_list(THD *thd, Item *item, bool asc)
|
|
{
|
|
return thd->lex->current_select->add_order_to_list(thd, item, asc);
|
|
}
|
|
|
|
inline bool add_group_to_list(THD *thd, Item *item, bool asc)
|
|
{
|
|
return thd->lex->current_select->add_group_to_list(thd, item, asc);
|
|
}
|
|
|
|
inline void mark_as_null_row(TABLE *table)
|
|
{
|
|
table->null_row=1;
|
|
table->status|=STATUS_NULL_ROW;
|
|
bfill(table->null_flags,table->s->null_bytes,255);
|
|
}
|
|
|
|
inline void table_case_convert(char * name, uint length)
|
|
{
|
|
if (lower_case_table_names)
|
|
files_charset_info->cset->casedn(files_charset_info,
|
|
name, length, name, length);
|
|
}
|
|
|
|
inline const char *table_case_name(HA_CREATE_INFO *info, const char *name)
|
|
{
|
|
return ((lower_case_table_names == 2 && info->alias) ? info->alias : name);
|
|
}
|
|
|
|
inline ulong sql_rnd_with_mutex()
|
|
{
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
ulong tmp=(ulong) (my_rnd(&sql_rand) * 0xffffffff); /* make all bits random */
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
return tmp;
|
|
}
|
|
|
|
Comp_creator *comp_eq_creator(bool invert);
|
|
Comp_creator *comp_ge_creator(bool invert);
|
|
Comp_creator *comp_gt_creator(bool invert);
|
|
Comp_creator *comp_le_creator(bool invert);
|
|
Comp_creator *comp_lt_creator(bool invert);
|
|
Comp_creator *comp_ne_creator(bool invert);
|
|
|
|
Item * all_any_subquery_creator(Item *left_expr,
|
|
chooser_compare_func_creator cmp,
|
|
bool all,
|
|
SELECT_LEX *select_lex);
|
|
|
|
/*
|
|
clean/setup table fields and map
|
|
|
|
SYNOPSYS
|
|
setup_table_map()
|
|
table - TABLE structure pointer (which should be setup)
|
|
table_list TABLE_LIST structure pointer (owner of TABLE)
|
|
tablenr - table number
|
|
*/
|
|
|
|
inline void setup_table_map(TABLE *table, TABLE_LIST *table_list, uint tablenr)
|
|
{
|
|
table->used_fields= 0;
|
|
table->const_table= 0;
|
|
table->null_row= 0;
|
|
table->status= STATUS_NO_RECORD;
|
|
table->keys_in_use_for_query= table->s->keys_in_use;
|
|
table->maybe_null= table_list->outer_join;
|
|
TABLE_LIST *embedding= table_list->embedding;
|
|
while (!table->maybe_null && embedding)
|
|
{
|
|
table->maybe_null= embedding->outer_join;
|
|
embedding= embedding->embedding;
|
|
}
|
|
table->tablenr= tablenr;
|
|
table->map= (table_map) 1 << tablenr;
|
|
table->force_index= table_list->force_index;
|
|
}
|
|
|
|
|
|
/*
|
|
SYNOPSYS
|
|
hexchar_to_int()
|
|
convert a hex digit into number
|
|
*/
|
|
|
|
inline int hexchar_to_int(char c)
|
|
{
|
|
if (c <= '9' && c >= '0')
|
|
return c-'0';
|
|
c|=32;
|
|
if (c <= 'f' && c >= 'a')
|
|
return c-'a'+10;
|
|
return -1;
|
|
}
|
|
|
|
/*
|
|
is_user_table()
|
|
return true if the table was created explicitly
|
|
*/
|
|
|
|
inline bool is_user_table(TABLE * table)
|
|
{
|
|
const char *name= table->s->table_name.str;
|
|
return strncmp(name, tmp_file_prefix, tmp_file_prefix_length);
|
|
}
|
|
|
|
/*
|
|
Some functions that are different in the embedded library and the normal
|
|
server
|
|
*/
|
|
|
|
#ifndef EMBEDDED_LIBRARY
|
|
extern "C" void unireg_abort(int exit_code) __attribute__((noreturn));
|
|
void kill_delayed_threads(void);
|
|
bool check_stack_overrun(THD *thd, long margin, char *dummy);
|
|
#else
|
|
#define unireg_abort(exit_code) DBUG_RETURN(exit_code)
|
|
inline void kill_delayed_threads(void) {}
|
|
#define check_stack_overrun(A, B, C) 0
|
|
#endif
|
|
|
|
/* Used by handlers to store things in schema tables */
|
|
#define IS_FILES_FILE_ID 0
|
|
#define IS_FILES_FILE_NAME 1
|
|
#define IS_FILES_FILE_TYPE 2
|
|
#define IS_FILES_TABLESPACE_NAME 3
|
|
#define IS_FILES_TABLE_CATALOG 4
|
|
#define IS_FILES_TABLE_SCHEMA 5
|
|
#define IS_FILES_TABLE_NAME 6
|
|
#define IS_FILES_LOGFILE_GROUP_NAME 7
|
|
#define IS_FILES_LOGFILE_GROUP_NUMBER 8
|
|
#define IS_FILES_ENGINE 9
|
|
#define IS_FILES_FULLTEXT_KEYS 10
|
|
#define IS_FILES_DELETED_ROWS 11
|
|
#define IS_FILES_UPDATE_COUNT 12
|
|
#define IS_FILES_FREE_EXTENTS 13
|
|
#define IS_FILES_TOTAL_EXTENTS 14
|
|
#define IS_FILES_EXTENT_SIZE 15
|
|
#define IS_FILES_INITIAL_SIZE 16
|
|
#define IS_FILES_MAXIMUM_SIZE 17
|
|
#define IS_FILES_AUTOEXTEND_SIZE 18
|
|
#define IS_FILES_CREATION_TIME 19
|
|
#define IS_FILES_LAST_UPDATE_TIME 20
|
|
#define IS_FILES_LAST_ACCESS_TIME 21
|
|
#define IS_FILES_RECOVER_TIME 22
|
|
#define IS_FILES_TRANSACTION_COUNTER 23
|
|
#define IS_FILES_VERSION 24
|
|
#define IS_FILES_ROW_FORMAT 25
|
|
#define IS_FILES_TABLE_ROWS 26
|
|
#define IS_FILES_AVG_ROW_LENGTH 27
|
|
#define IS_FILES_DATA_LENGTH 28
|
|
#define IS_FILES_MAX_DATA_LENGTH 29
|
|
#define IS_FILES_INDEX_LENGTH 30
|
|
#define IS_FILES_DATA_FREE 31
|
|
#define IS_FILES_CREATE_TIME 32
|
|
#define IS_FILES_UPDATE_TIME 33
|
|
#define IS_FILES_CHECK_TIME 34
|
|
#define IS_FILES_CHECKSUM 35
|
|
#define IS_FILES_STATUS 36
|
|
#define IS_FILES_EXTRA 37
|
|
void init_fill_schema_files_row(TABLE* table);
|
|
bool schema_table_store_record(THD *thd, TABLE *table);
|
|
|
|
/* sql/item_create.cc */
|
|
int item_create_init();
|
|
void item_create_cleanup();
|
|
|
|
#endif /* MYSQL_SERVER */
|
|
#endif /* MYSQL_CLIENT */
|
|
|
|
#endif /* MYSQL_PRIV_H */
|