mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +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
1906 lines
55 KiB
C++
1906 lines
55 KiB
C++
/* Copyright (C) 2002 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "mysql_priv.h"
|
|
#include "sp.h"
|
|
#include "sp_head.h"
|
|
#include "sp_cache.h"
|
|
#include "sql_trigger.h"
|
|
|
|
#include <my_user.h>
|
|
|
|
static bool
|
|
create_string(THD *thd, String *buf,
|
|
int sp_type,
|
|
sp_name *name,
|
|
const char *params, ulong paramslen,
|
|
const char *returns, ulong returnslen,
|
|
const char *body, ulong bodylen,
|
|
st_sp_chistics *chistics,
|
|
const LEX_STRING *definer_user,
|
|
const LEX_STRING *definer_host);
|
|
static int
|
|
db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
|
|
ulong sql_mode, const char *params, const char *returns,
|
|
const char *body, st_sp_chistics &chistics,
|
|
const char *definer, longlong created, longlong modified);
|
|
|
|
/*
|
|
*
|
|
* DB storage of Stored PROCEDUREs and FUNCTIONs
|
|
*
|
|
*/
|
|
|
|
enum
|
|
{
|
|
MYSQL_PROC_FIELD_DB = 0,
|
|
MYSQL_PROC_FIELD_NAME,
|
|
MYSQL_PROC_MYSQL_TYPE,
|
|
MYSQL_PROC_FIELD_SPECIFIC_NAME,
|
|
MYSQL_PROC_FIELD_LANGUAGE,
|
|
MYSQL_PROC_FIELD_ACCESS,
|
|
MYSQL_PROC_FIELD_DETERMINISTIC,
|
|
MYSQL_PROC_FIELD_SECURITY_TYPE,
|
|
MYSQL_PROC_FIELD_PARAM_LIST,
|
|
MYSQL_PROC_FIELD_RETURNS,
|
|
MYSQL_PROC_FIELD_BODY,
|
|
MYSQL_PROC_FIELD_DEFINER,
|
|
MYSQL_PROC_FIELD_CREATED,
|
|
MYSQL_PROC_FIELD_MODIFIED,
|
|
MYSQL_PROC_FIELD_SQL_MODE,
|
|
MYSQL_PROC_FIELD_COMMENT,
|
|
MYSQL_PROC_FIELD_COUNT
|
|
};
|
|
|
|
/* Tells what SP_DEFAULT_ACCESS should be mapped to */
|
|
#define SP_DEFAULT_ACCESS_MAPPING SP_CONTAINS_SQL
|
|
|
|
|
|
/*
|
|
Close mysql.proc, opened with open_proc_table_for_read().
|
|
|
|
SYNOPSIS
|
|
close_proc_table()
|
|
thd Thread context
|
|
backup Pointer to Open_tables_state instance which holds
|
|
information about tables which were open before we
|
|
decided to access mysql.proc.
|
|
*/
|
|
|
|
void close_proc_table(THD *thd, Open_tables_state *backup)
|
|
{
|
|
close_thread_tables(thd);
|
|
thd->restore_backup_open_tables_state(backup);
|
|
}
|
|
|
|
|
|
/*
|
|
Open the mysql.proc table for read.
|
|
|
|
SYNOPSIS
|
|
open_proc_table_for_read()
|
|
thd Thread context
|
|
backup Pointer to Open_tables_state instance where information about
|
|
currently open tables will be saved, and from which will be
|
|
restored when we will end work with mysql.proc.
|
|
|
|
NOTES
|
|
Thanks to restrictions which we put on opening and locking of
|
|
this table for writing, we can open and lock it for reading
|
|
even when we already have some other tables open and locked.
|
|
One must call close_proc_table() to close table opened with
|
|
this call.
|
|
|
|
RETURN
|
|
0 Error
|
|
# Pointer to TABLE object of mysql.proc
|
|
*/
|
|
|
|
TABLE *open_proc_table_for_read(THD *thd, Open_tables_state *backup)
|
|
{
|
|
TABLE_LIST tables;
|
|
TABLE *table;
|
|
bool not_used;
|
|
DBUG_ENTER("open_proc_table");
|
|
|
|
thd->reset_n_backup_open_tables_state(backup);
|
|
|
|
bzero((char*) &tables, sizeof(tables));
|
|
tables.db= (char*) "mysql";
|
|
tables.table_name= tables.alias= (char*)"proc";
|
|
if (!(table= open_table(thd, &tables, thd->mem_root, ¬_used,
|
|
MYSQL_LOCK_IGNORE_FLUSH)))
|
|
{
|
|
thd->restore_backup_open_tables_state(backup);
|
|
DBUG_RETURN(0);
|
|
}
|
|
table->use_all_columns();
|
|
|
|
DBUG_ASSERT(table->s->system_table);
|
|
|
|
table->reginfo.lock_type= TL_READ;
|
|
/*
|
|
We have to ensure we are not blocked by a flush tables, as this
|
|
could lead to a deadlock if we have other tables opened.
|
|
*/
|
|
if (!(thd->lock= mysql_lock_tables(thd, &table, 1,
|
|
MYSQL_LOCK_IGNORE_FLUSH, ¬_used)))
|
|
{
|
|
close_proc_table(thd, backup);
|
|
DBUG_RETURN(0);
|
|
}
|
|
DBUG_RETURN(table);
|
|
}
|
|
|
|
|
|
/*
|
|
Open the mysql.proc table for update.
|
|
|
|
SYNOPSIS
|
|
open_proc_table_for_update()
|
|
thd Thread context
|
|
|
|
NOTES
|
|
Table opened with this call should closed using close_thread_tables().
|
|
|
|
RETURN
|
|
0 Error
|
|
# Pointer to TABLE object of mysql.proc
|
|
*/
|
|
|
|
static TABLE *open_proc_table_for_update(THD *thd)
|
|
{
|
|
TABLE_LIST tables;
|
|
TABLE *table;
|
|
DBUG_ENTER("open_proc_table");
|
|
|
|
bzero((char*) &tables, sizeof(tables));
|
|
tables.db= (char*) "mysql";
|
|
tables.table_name= tables.alias= (char*)"proc";
|
|
tables.lock_type= TL_WRITE;
|
|
|
|
table= open_ltable(thd, &tables, TL_WRITE);
|
|
if (table)
|
|
table->use_all_columns();
|
|
|
|
DBUG_RETURN(table);
|
|
}
|
|
|
|
|
|
/*
|
|
Find row in open mysql.proc table representing stored routine.
|
|
|
|
SYNOPSIS
|
|
db_find_routine_aux()
|
|
thd Thread context
|
|
type Type of routine to find (function or procedure)
|
|
name Name of routine
|
|
table TABLE object for open mysql.proc table.
|
|
|
|
RETURN VALUE
|
|
SP_OK - Routine found
|
|
SP_KEY_NOT_FOUND- No routine with given name
|
|
*/
|
|
|
|
static int
|
|
db_find_routine_aux(THD *thd, int type, sp_name *name, TABLE *table)
|
|
{
|
|
byte key[MAX_KEY_LENGTH]; // db, name, optional key length type
|
|
DBUG_ENTER("db_find_routine_aux");
|
|
DBUG_PRINT("enter", ("type: %d name: %.*s",
|
|
type, name->m_name.length, name->m_name.str));
|
|
|
|
/*
|
|
Create key to find row. We have to use field->store() to be able to
|
|
handle VARCHAR and CHAR fields.
|
|
Assumption here is that the three first fields in the table are
|
|
'db', 'name' and 'type' and the first key is the primary key over the
|
|
same fields.
|
|
*/
|
|
if (name->m_name.length > table->field[1]->field_length)
|
|
DBUG_RETURN(SP_KEY_NOT_FOUND);
|
|
table->field[0]->store(name->m_db.str, name->m_db.length, &my_charset_bin);
|
|
table->field[1]->store(name->m_name.str, name->m_name.length,
|
|
&my_charset_bin);
|
|
table->field[2]->store((longlong) type, TRUE);
|
|
key_copy(key, table->record[0], table->key_info,
|
|
table->key_info->key_length);
|
|
|
|
if (table->file->index_read_idx(table->record[0], 0,
|
|
key, table->key_info->key_length,
|
|
HA_READ_KEY_EXACT))
|
|
DBUG_RETURN(SP_KEY_NOT_FOUND);
|
|
|
|
DBUG_RETURN(SP_OK);
|
|
}
|
|
|
|
|
|
/*
|
|
Find routine definition in mysql.proc table and create corresponding
|
|
sp_head object for it.
|
|
|
|
SYNOPSIS
|
|
db_find_routine()
|
|
thd Thread context
|
|
type Type of routine (TYPE_ENUM_PROCEDURE/...)
|
|
name Name of routine
|
|
sphp Out parameter in which pointer to created sp_head
|
|
object is returned (0 in case of error).
|
|
|
|
NOTE
|
|
This function may damage current LEX during execution, so it is good
|
|
idea to create temporary LEX and make it active before calling it.
|
|
|
|
RETURN VALUE
|
|
0 - Success
|
|
non-0 - Error (may be one of special codes like SP_KEY_NOT_FOUND)
|
|
*/
|
|
|
|
static int
|
|
db_find_routine(THD *thd, int type, sp_name *name, sp_head **sphp)
|
|
{
|
|
TABLE *table;
|
|
const char *params, *returns, *body;
|
|
int ret;
|
|
const char *definer;
|
|
longlong created;
|
|
longlong modified;
|
|
st_sp_chistics chistics;
|
|
char *ptr;
|
|
uint length;
|
|
char buff[65];
|
|
String str(buff, sizeof(buff), &my_charset_bin);
|
|
ulong sql_mode;
|
|
Open_tables_state open_tables_state_backup;
|
|
DBUG_ENTER("db_find_routine");
|
|
DBUG_PRINT("enter", ("type: %d name: %.*s",
|
|
type, name->m_name.length, name->m_name.str));
|
|
|
|
*sphp= 0; // In case of errors
|
|
if (!(table= open_proc_table_for_read(thd, &open_tables_state_backup)))
|
|
DBUG_RETURN(SP_OPEN_TABLE_FAILED);
|
|
|
|
if ((ret= db_find_routine_aux(thd, type, name, table)) != SP_OK)
|
|
goto done;
|
|
|
|
if (table->s->fields != MYSQL_PROC_FIELD_COUNT)
|
|
{
|
|
ret= SP_GET_FIELD_FAILED;
|
|
goto done;
|
|
}
|
|
|
|
bzero((char *)&chistics, sizeof(chistics));
|
|
if ((ptr= get_field(thd->mem_root,
|
|
table->field[MYSQL_PROC_FIELD_ACCESS])) == NULL)
|
|
{
|
|
ret= SP_GET_FIELD_FAILED;
|
|
goto done;
|
|
}
|
|
switch (ptr[0]) {
|
|
case 'N':
|
|
chistics.daccess= SP_NO_SQL;
|
|
break;
|
|
case 'C':
|
|
chistics.daccess= SP_CONTAINS_SQL;
|
|
break;
|
|
case 'R':
|
|
chistics.daccess= SP_READS_SQL_DATA;
|
|
break;
|
|
case 'M':
|
|
chistics.daccess= SP_MODIFIES_SQL_DATA;
|
|
break;
|
|
default:
|
|
chistics.daccess= SP_DEFAULT_ACCESS_MAPPING;
|
|
}
|
|
|
|
if ((ptr= get_field(thd->mem_root,
|
|
table->field[MYSQL_PROC_FIELD_DETERMINISTIC])) == NULL)
|
|
{
|
|
ret= SP_GET_FIELD_FAILED;
|
|
goto done;
|
|
}
|
|
chistics.detistic= (ptr[0] == 'N' ? FALSE : TRUE);
|
|
|
|
if ((ptr= get_field(thd->mem_root,
|
|
table->field[MYSQL_PROC_FIELD_SECURITY_TYPE])) == NULL)
|
|
{
|
|
ret= SP_GET_FIELD_FAILED;
|
|
goto done;
|
|
}
|
|
chistics.suid= (ptr[0] == 'I' ? SP_IS_NOT_SUID : SP_IS_SUID);
|
|
|
|
if ((params= get_field(thd->mem_root,
|
|
table->field[MYSQL_PROC_FIELD_PARAM_LIST])) == NULL)
|
|
{
|
|
params= "";
|
|
}
|
|
|
|
if (type == TYPE_ENUM_PROCEDURE)
|
|
returns= "";
|
|
else if ((returns= get_field(thd->mem_root,
|
|
table->field[MYSQL_PROC_FIELD_RETURNS])) == NULL)
|
|
{
|
|
ret= SP_GET_FIELD_FAILED;
|
|
goto done;
|
|
}
|
|
|
|
if ((body= get_field(thd->mem_root,
|
|
table->field[MYSQL_PROC_FIELD_BODY])) == NULL)
|
|
{
|
|
ret= SP_GET_FIELD_FAILED;
|
|
goto done;
|
|
}
|
|
|
|
// Get additional information
|
|
if ((definer= get_field(thd->mem_root,
|
|
table->field[MYSQL_PROC_FIELD_DEFINER])) == NULL)
|
|
{
|
|
ret= SP_GET_FIELD_FAILED;
|
|
goto done;
|
|
}
|
|
|
|
modified= table->field[MYSQL_PROC_FIELD_MODIFIED]->val_int();
|
|
created= table->field[MYSQL_PROC_FIELD_CREATED]->val_int();
|
|
|
|
sql_mode= (ulong) table->field[MYSQL_PROC_FIELD_SQL_MODE]->val_int();
|
|
|
|
table->field[MYSQL_PROC_FIELD_COMMENT]->val_str(&str, &str);
|
|
|
|
ptr= 0;
|
|
if ((length= str.length()))
|
|
ptr= thd->strmake(str.ptr(), length);
|
|
chistics.comment.str= ptr;
|
|
chistics.comment.length= length;
|
|
|
|
close_proc_table(thd, &open_tables_state_backup);
|
|
table= 0;
|
|
|
|
ret= db_load_routine(thd, type, name, sphp,
|
|
sql_mode, params, returns, body, chistics,
|
|
definer, created, modified);
|
|
|
|
done:
|
|
if (table)
|
|
close_proc_table(thd, &open_tables_state_backup);
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
static int
|
|
db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp,
|
|
ulong sql_mode, const char *params, const char *returns,
|
|
const char *body, st_sp_chistics &chistics,
|
|
const char *definer, longlong created, longlong modified)
|
|
{
|
|
LEX *old_lex= thd->lex, newlex;
|
|
String defstr;
|
|
char old_db_buf[NAME_LEN+1];
|
|
LEX_STRING old_db= { old_db_buf, sizeof(old_db_buf) };
|
|
bool dbchanged;
|
|
ulong old_sql_mode= thd->variables.sql_mode;
|
|
ha_rows old_select_limit= thd->variables.select_limit;
|
|
sp_rcontext *old_spcont= thd->spcont;
|
|
|
|
char definer_user_name_holder[USERNAME_LENGTH + 1];
|
|
LEX_STRING definer_user_name= { definer_user_name_holder,
|
|
USERNAME_LENGTH };
|
|
|
|
char definer_host_name_holder[HOSTNAME_LENGTH + 1];
|
|
LEX_STRING definer_host_name= { definer_host_name_holder, HOSTNAME_LENGTH };
|
|
|
|
int ret;
|
|
|
|
thd->variables.sql_mode= sql_mode;
|
|
thd->variables.select_limit= HA_POS_ERROR;
|
|
|
|
thd->lex= &newlex;
|
|
newlex.current_select= NULL;
|
|
|
|
parse_user(definer, strlen(definer),
|
|
definer_user_name.str, &definer_user_name.length,
|
|
definer_host_name.str, &definer_host_name.length);
|
|
|
|
defstr.set_charset(system_charset_info);
|
|
|
|
/*
|
|
We have to add DEFINER clause and provide proper routine characterstics in
|
|
routine definition statement that we build here to be able to use this
|
|
definition for SHOW CREATE PROCEDURE later.
|
|
*/
|
|
|
|
if (!create_string(thd, &defstr,
|
|
type,
|
|
name,
|
|
params, strlen(params),
|
|
returns, strlen(returns),
|
|
body, strlen(body),
|
|
&chistics, &definer_user_name, &definer_host_name))
|
|
{
|
|
ret= SP_INTERNAL_ERROR;
|
|
goto end;
|
|
}
|
|
|
|
if ((ret= sp_use_new_db(thd, name->m_db, &old_db, 1, &dbchanged)))
|
|
goto end;
|
|
|
|
lex_start(thd, (uchar*)defstr.c_ptr(), defstr.length());
|
|
|
|
thd->spcont= 0;
|
|
if (MYSQLparse(thd) || thd->is_fatal_error || newlex.sphead == NULL)
|
|
{
|
|
sp_head *sp= newlex.sphead;
|
|
|
|
if (dbchanged && (ret= mysql_change_db(thd, old_db.str, 1)))
|
|
goto end;
|
|
delete sp;
|
|
ret= SP_PARSE_ERROR;
|
|
}
|
|
else
|
|
{
|
|
if (dbchanged && (ret= mysql_change_db(thd, old_db.str, 1)))
|
|
goto end;
|
|
*sphp= newlex.sphead;
|
|
(*sphp)->set_definer(&definer_user_name, &definer_host_name);
|
|
(*sphp)->set_info(created, modified, &chistics, sql_mode);
|
|
(*sphp)->optimize();
|
|
}
|
|
end:
|
|
lex_end(thd->lex);
|
|
thd->spcont= old_spcont;
|
|
thd->variables.sql_mode= old_sql_mode;
|
|
thd->variables.select_limit= old_select_limit;
|
|
thd->lex= old_lex;
|
|
return ret;
|
|
}
|
|
|
|
|
|
static void
|
|
sp_returns_type(THD *thd, String &result, sp_head *sp)
|
|
{
|
|
TABLE table;
|
|
TABLE_SHARE share;
|
|
Field *field;
|
|
bzero((char*) &table, sizeof(table));
|
|
bzero((char*) &share, sizeof(share));
|
|
table.in_use= thd;
|
|
table.s = &share;
|
|
field= sp->create_result_field(0, 0, &table);
|
|
field->sql_type(result);
|
|
|
|
if (field->has_charset())
|
|
{
|
|
result.append(STRING_WITH_LEN(" CHARSET "));
|
|
result.append(field->charset()->csname);
|
|
}
|
|
|
|
delete field;
|
|
}
|
|
|
|
static int
|
|
db_create_routine(THD *thd, int type, sp_head *sp)
|
|
{
|
|
int ret;
|
|
TABLE *table;
|
|
char definer[USER_HOST_BUFF_SIZE];
|
|
char old_db_buf[NAME_LEN+1];
|
|
LEX_STRING old_db= { old_db_buf, sizeof(old_db_buf) };
|
|
DBUG_ENTER("db_create_routine");
|
|
DBUG_PRINT("enter", ("type: %d name: %.*s",type,sp->m_name.length,
|
|
sp->m_name.str));
|
|
|
|
if (!(table= open_proc_table_for_update(thd)))
|
|
ret= SP_OPEN_TABLE_FAILED;
|
|
else
|
|
{
|
|
restore_record(table, s->default_values); // Get default values for fields
|
|
|
|
/* NOTE: all needed privilege checks have been already done. */
|
|
strxnmov(definer, sizeof(definer)-1, thd->lex->definer->user.str, "@",
|
|
thd->lex->definer->host.str, NullS);
|
|
|
|
if (table->s->fields != MYSQL_PROC_FIELD_COUNT)
|
|
{
|
|
ret= SP_GET_FIELD_FAILED;
|
|
goto done;
|
|
}
|
|
|
|
if (system_charset_info->cset->numchars(system_charset_info,
|
|
sp->m_name.str,
|
|
sp->m_name.str+sp->m_name.length) >
|
|
table->field[MYSQL_PROC_FIELD_NAME]->char_length())
|
|
{
|
|
ret= SP_BAD_IDENTIFIER;
|
|
goto done;
|
|
}
|
|
if (sp->m_body.length > table->field[MYSQL_PROC_FIELD_BODY]->field_length)
|
|
{
|
|
ret= SP_BODY_TOO_LONG;
|
|
goto done;
|
|
}
|
|
table->field[MYSQL_PROC_FIELD_DB]->
|
|
store(sp->m_db.str, sp->m_db.length, system_charset_info);
|
|
table->field[MYSQL_PROC_FIELD_NAME]->
|
|
store(sp->m_name.str, sp->m_name.length, system_charset_info);
|
|
table->field[MYSQL_PROC_MYSQL_TYPE]->
|
|
store((longlong)type, TRUE);
|
|
table->field[MYSQL_PROC_FIELD_SPECIFIC_NAME]->
|
|
store(sp->m_name.str, sp->m_name.length, system_charset_info);
|
|
if (sp->m_chistics->daccess != SP_DEFAULT_ACCESS)
|
|
table->field[MYSQL_PROC_FIELD_ACCESS]->
|
|
store((longlong)sp->m_chistics->daccess, TRUE);
|
|
table->field[MYSQL_PROC_FIELD_DETERMINISTIC]->
|
|
store((longlong)(sp->m_chistics->detistic ? 1 : 2), TRUE);
|
|
if (sp->m_chistics->suid != SP_IS_DEFAULT_SUID)
|
|
table->field[MYSQL_PROC_FIELD_SECURITY_TYPE]->
|
|
store((longlong)sp->m_chistics->suid, TRUE);
|
|
table->field[MYSQL_PROC_FIELD_PARAM_LIST]->
|
|
store(sp->m_params.str, sp->m_params.length, system_charset_info);
|
|
if (sp->m_type == TYPE_ENUM_FUNCTION)
|
|
{
|
|
String retstr(64);
|
|
sp_returns_type(thd, retstr, sp);
|
|
table->field[MYSQL_PROC_FIELD_RETURNS]->
|
|
store(retstr.ptr(), retstr.length(), system_charset_info);
|
|
}
|
|
table->field[MYSQL_PROC_FIELD_BODY]->
|
|
store(sp->m_body.str, sp->m_body.length, system_charset_info);
|
|
table->field[MYSQL_PROC_FIELD_DEFINER]->
|
|
store(definer, (uint)strlen(definer), system_charset_info);
|
|
((Field_timestamp *)table->field[MYSQL_PROC_FIELD_CREATED])->set_time();
|
|
((Field_timestamp *)table->field[MYSQL_PROC_FIELD_MODIFIED])->set_time();
|
|
table->field[MYSQL_PROC_FIELD_SQL_MODE]->
|
|
store((longlong)thd->variables.sql_mode, TRUE);
|
|
if (sp->m_chistics->comment.str)
|
|
table->field[MYSQL_PROC_FIELD_COMMENT]->
|
|
store(sp->m_chistics->comment.str, sp->m_chistics->comment.length,
|
|
system_charset_info);
|
|
|
|
if ((sp->m_type == TYPE_ENUM_FUNCTION) &&
|
|
!trust_function_creators && mysql_bin_log.is_open())
|
|
{
|
|
if (!sp->m_chistics->detistic)
|
|
{
|
|
/*
|
|
Note that this test is not perfect; one could use
|
|
a non-deterministic read-only function in an update statement.
|
|
*/
|
|
enum enum_sp_data_access access=
|
|
(sp->m_chistics->daccess == SP_DEFAULT_ACCESS) ?
|
|
SP_DEFAULT_ACCESS_MAPPING : sp->m_chistics->daccess;
|
|
if (access == SP_CONTAINS_SQL ||
|
|
access == SP_MODIFIES_SQL_DATA)
|
|
{
|
|
my_message(ER_BINLOG_UNSAFE_ROUTINE,
|
|
ER(ER_BINLOG_UNSAFE_ROUTINE), MYF(0));
|
|
ret= SP_INTERNAL_ERROR;
|
|
goto done;
|
|
}
|
|
}
|
|
if (!(thd->security_ctx->master_access & SUPER_ACL))
|
|
{
|
|
my_message(ER_BINLOG_CREATE_ROUTINE_NEED_SUPER,
|
|
ER(ER_BINLOG_CREATE_ROUTINE_NEED_SUPER), MYF(0));
|
|
ret= SP_INTERNAL_ERROR;
|
|
goto done;
|
|
}
|
|
}
|
|
|
|
ret= SP_OK;
|
|
if (table->file->ha_write_row(table->record[0]))
|
|
ret= SP_WRITE_ROW_FAILED;
|
|
else if (mysql_bin_log.is_open())
|
|
{
|
|
thd->clear_error();
|
|
|
|
String log_query;
|
|
log_query.set_charset(system_charset_info);
|
|
log_query.append(STRING_WITH_LEN("CREATE "));
|
|
append_definer(thd, &log_query, &thd->lex->definer->user,
|
|
&thd->lex->definer->host);
|
|
log_query.append(thd->lex->stmt_definition_begin,
|
|
(char *)sp->m_body_begin -
|
|
thd->lex->stmt_definition_begin +
|
|
sp->m_body.length);
|
|
|
|
/* Such a statement can always go directly to binlog, no trans cache */
|
|
thd->binlog_query(THD::MYSQL_QUERY_TYPE,
|
|
log_query.c_ptr(), log_query.length(), FALSE, FALSE);
|
|
}
|
|
|
|
}
|
|
|
|
done:
|
|
close_thread_tables(thd);
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
static int
|
|
db_drop_routine(THD *thd, int type, sp_name *name)
|
|
{
|
|
TABLE *table;
|
|
int ret;
|
|
DBUG_ENTER("db_drop_routine");
|
|
DBUG_PRINT("enter", ("type: %d name: %.*s",
|
|
type, name->m_name.length, name->m_name.str));
|
|
|
|
if (!(table= open_proc_table_for_update(thd)))
|
|
DBUG_RETURN(SP_OPEN_TABLE_FAILED);
|
|
if ((ret= db_find_routine_aux(thd, type, name, table)) == SP_OK)
|
|
{
|
|
if (table->file->ha_delete_row(table->record[0]))
|
|
ret= SP_DELETE_ROW_FAILED;
|
|
}
|
|
|
|
if (ret == SP_OK)
|
|
{
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
thd->clear_error();
|
|
thd->binlog_query(THD::MYSQL_QUERY_TYPE,
|
|
thd->query, thd->query_length, FALSE, FALSE);
|
|
}
|
|
}
|
|
|
|
close_thread_tables(thd);
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
static int
|
|
db_update_routine(THD *thd, int type, sp_name *name, st_sp_chistics *chistics)
|
|
{
|
|
TABLE *table;
|
|
int ret;
|
|
DBUG_ENTER("db_update_routine");
|
|
DBUG_PRINT("enter", ("type: %d name: %.*s",
|
|
type, name->m_name.length, name->m_name.str));
|
|
|
|
if (!(table= open_proc_table_for_update(thd)))
|
|
DBUG_RETURN(SP_OPEN_TABLE_FAILED);
|
|
if ((ret= db_find_routine_aux(thd, type, name, table)) == SP_OK)
|
|
{
|
|
store_record(table,record[1]);
|
|
table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
|
|
((Field_timestamp *)table->field[MYSQL_PROC_FIELD_MODIFIED])->set_time();
|
|
if (chistics->suid != SP_IS_DEFAULT_SUID)
|
|
table->field[MYSQL_PROC_FIELD_SECURITY_TYPE]->
|
|
store((longlong)chistics->suid, TRUE);
|
|
if (chistics->daccess != SP_DEFAULT_ACCESS)
|
|
table->field[MYSQL_PROC_FIELD_ACCESS]->
|
|
store((longlong)chistics->daccess, TRUE);
|
|
if (chistics->comment.str)
|
|
table->field[MYSQL_PROC_FIELD_COMMENT]->store(chistics->comment.str,
|
|
chistics->comment.length,
|
|
system_charset_info);
|
|
if ((table->file->ha_update_row(table->record[1],table->record[0])))
|
|
ret= SP_WRITE_ROW_FAILED;
|
|
}
|
|
|
|
if (ret == SP_OK)
|
|
{
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
thd->clear_error();
|
|
thd->binlog_query(THD::MYSQL_QUERY_TYPE,
|
|
thd->query, thd->query_length, FALSE, FALSE);
|
|
}
|
|
}
|
|
|
|
close_thread_tables(thd);
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
struct st_used_field
|
|
{
|
|
const char *field_name;
|
|
uint field_length;
|
|
enum enum_field_types field_type;
|
|
Field *field;
|
|
};
|
|
|
|
static struct st_used_field init_fields[]=
|
|
{
|
|
{ "Db", NAME_LEN, MYSQL_TYPE_STRING, 0},
|
|
{ "Name", NAME_LEN, MYSQL_TYPE_STRING, 0},
|
|
{ "Type", 9, MYSQL_TYPE_STRING, 0},
|
|
{ "Definer", 77, MYSQL_TYPE_STRING, 0},
|
|
{ "Modified", 0, MYSQL_TYPE_TIMESTAMP, 0},
|
|
{ "Created", 0, MYSQL_TYPE_TIMESTAMP, 0},
|
|
{ "Security_type", 1, MYSQL_TYPE_STRING, 0},
|
|
{ "Comment", NAME_LEN, MYSQL_TYPE_STRING, 0},
|
|
{ 0, 0, MYSQL_TYPE_STRING, 0}
|
|
};
|
|
|
|
|
|
static int
|
|
print_field_values(THD *thd, TABLE *table,
|
|
struct st_used_field *used_fields,
|
|
int type, const char *wild)
|
|
{
|
|
Protocol *protocol= thd->protocol;
|
|
|
|
if (table->field[MYSQL_PROC_MYSQL_TYPE]->val_int() == type)
|
|
{
|
|
String db_string;
|
|
String name_string;
|
|
struct st_used_field *used_field= used_fields;
|
|
|
|
if (get_field(thd->mem_root, used_field->field, &db_string))
|
|
db_string.set_ascii("", 0);
|
|
used_field+= 1;
|
|
get_field(thd->mem_root, used_field->field, &name_string);
|
|
|
|
if (!wild || !wild[0] || !wild_compare(name_string.ptr(), wild, 0))
|
|
{
|
|
protocol->prepare_for_resend();
|
|
protocol->store(&db_string);
|
|
protocol->store(&name_string);
|
|
for (used_field++;
|
|
used_field->field_name;
|
|
used_field++)
|
|
{
|
|
switch (used_field->field_type) {
|
|
case MYSQL_TYPE_TIMESTAMP:
|
|
{
|
|
TIME tmp_time;
|
|
|
|
bzero((char *)&tmp_time, sizeof(tmp_time));
|
|
((Field_timestamp *) used_field->field)->get_time(&tmp_time);
|
|
protocol->store(&tmp_time);
|
|
}
|
|
break;
|
|
default:
|
|
{
|
|
String tmp_string;
|
|
|
|
get_field(thd->mem_root, used_field->field, &tmp_string);
|
|
protocol->store(&tmp_string);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
if (protocol->write())
|
|
return SP_INTERNAL_ERROR;
|
|
}
|
|
}
|
|
|
|
return SP_OK;
|
|
}
|
|
|
|
|
|
static int
|
|
db_show_routine_status(THD *thd, int type, const char *wild)
|
|
{
|
|
TABLE *table;
|
|
TABLE_LIST tables;
|
|
int res;
|
|
DBUG_ENTER("db_show_routine_status");
|
|
|
|
memset(&tables, 0, sizeof(tables));
|
|
tables.db= (char*)"mysql";
|
|
tables.table_name= tables.alias= (char*)"proc";
|
|
|
|
if (! (table= open_ltable(thd, &tables, TL_READ)))
|
|
{
|
|
res= SP_OPEN_TABLE_FAILED;
|
|
goto done;
|
|
}
|
|
else
|
|
{
|
|
Item *item;
|
|
List<Item> field_list;
|
|
struct st_used_field *used_field;
|
|
TABLE_LIST *leaves= 0;
|
|
st_used_field used_fields[array_elements(init_fields)];
|
|
|
|
table->use_all_columns();
|
|
memcpy((char*) used_fields, (char*) init_fields, sizeof(used_fields));
|
|
/* Init header */
|
|
for (used_field= &used_fields[0];
|
|
used_field->field_name;
|
|
used_field++)
|
|
{
|
|
switch (used_field->field_type) {
|
|
case MYSQL_TYPE_TIMESTAMP:
|
|
field_list.push_back(item=new Item_datetime(used_field->field_name));
|
|
break;
|
|
default:
|
|
field_list.push_back(item=new Item_empty_string(used_field->field_name,
|
|
used_field->
|
|
field_length));
|
|
break;
|
|
}
|
|
}
|
|
/* Print header */
|
|
if (thd->protocol->send_fields(&field_list, Protocol::SEND_NUM_ROWS |
|
|
Protocol::SEND_EOF))
|
|
{
|
|
res= SP_INTERNAL_ERROR;
|
|
goto err_case;
|
|
}
|
|
|
|
/*
|
|
Init fields
|
|
|
|
tables is not VIEW for sure => we can pass 0 as condition
|
|
*/
|
|
thd->lex->select_lex.context.resolve_in_table_list_only(&tables);
|
|
setup_tables(thd, &thd->lex->select_lex.context,
|
|
&thd->lex->select_lex.top_join_list,
|
|
&tables, &leaves, FALSE);
|
|
for (used_field= &used_fields[0];
|
|
used_field->field_name;
|
|
used_field++)
|
|
{
|
|
Item_field *field= new Item_field(&thd->lex->select_lex.context,
|
|
"mysql", "proc",
|
|
used_field->field_name);
|
|
if (!field ||
|
|
!(used_field->field= find_field_in_tables(thd, field, &tables, NULL,
|
|
0, REPORT_ALL_ERRORS, 1,
|
|
TRUE)))
|
|
{
|
|
res= SP_INTERNAL_ERROR;
|
|
goto err_case1;
|
|
}
|
|
}
|
|
|
|
table->file->ha_index_init(0, 1);
|
|
if ((res= table->file->index_first(table->record[0])))
|
|
{
|
|
res= (res == HA_ERR_END_OF_FILE) ? 0 : SP_INTERNAL_ERROR;
|
|
goto err_case1;
|
|
}
|
|
if ((res= print_field_values(thd, table, used_fields, type, wild)))
|
|
goto err_case1;
|
|
while (!table->file->index_next(table->record[0]))
|
|
{
|
|
if ((res= print_field_values(thd, table, used_fields, type, wild)))
|
|
goto err_case1;
|
|
}
|
|
res= SP_OK;
|
|
}
|
|
|
|
err_case1:
|
|
send_eof(thd);
|
|
err_case:
|
|
table->file->ha_index_end();
|
|
close_thread_tables(thd);
|
|
done:
|
|
DBUG_RETURN(res);
|
|
}
|
|
|
|
|
|
/* Drop all routines in database 'db' */
|
|
int
|
|
sp_drop_db_routines(THD *thd, char *db)
|
|
{
|
|
TABLE *table;
|
|
int ret;
|
|
uint key_len;
|
|
DBUG_ENTER("sp_drop_db_routines");
|
|
DBUG_PRINT("enter", ("db: %s", db));
|
|
|
|
ret= SP_OPEN_TABLE_FAILED;
|
|
if (!(table= open_proc_table_for_update(thd)))
|
|
goto err;
|
|
|
|
table->field[MYSQL_PROC_FIELD_DB]->store(db, strlen(db), system_charset_info);
|
|
key_len= table->key_info->key_part[0].store_length;
|
|
|
|
ret= SP_OK;
|
|
table->file->ha_index_init(0, 1);
|
|
if (! table->file->index_read(table->record[0],
|
|
(byte *)table->field[MYSQL_PROC_FIELD_DB]->ptr,
|
|
key_len, HA_READ_KEY_EXACT))
|
|
{
|
|
int nxtres;
|
|
bool deleted= FALSE;
|
|
|
|
do
|
|
{
|
|
if (! table->file->ha_delete_row(table->record[0]))
|
|
deleted= TRUE; /* We deleted something */
|
|
else
|
|
{
|
|
ret= SP_DELETE_ROW_FAILED;
|
|
nxtres= 0;
|
|
break;
|
|
}
|
|
} while (! (nxtres= table->file->index_next_same(table->record[0],
|
|
(byte *)table->field[MYSQL_PROC_FIELD_DB]->ptr,
|
|
key_len)));
|
|
if (nxtres != HA_ERR_END_OF_FILE)
|
|
ret= SP_KEY_NOT_FOUND;
|
|
if (deleted)
|
|
sp_cache_invalidate();
|
|
}
|
|
table->file->ha_index_end();
|
|
|
|
close_thread_tables(thd);
|
|
|
|
err:
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
/*****************************************************************************
|
|
PROCEDURE
|
|
******************************************************************************/
|
|
|
|
/*
|
|
Obtain object representing stored procedure/function by its name from
|
|
stored procedures cache and looking into mysql.proc if needed.
|
|
|
|
SYNOPSIS
|
|
sp_find_routine()
|
|
thd - thread context
|
|
type - type of object (TYPE_ENUM_FUNCTION or TYPE_ENUM_PROCEDURE)
|
|
name - name of procedure
|
|
cp - hash to look routine in
|
|
cache_only - if true perform cache-only lookup
|
|
(Don't look in mysql.proc).
|
|
|
|
RETURN VALUE
|
|
Non-0 pointer to sp_head object for the procedure, or
|
|
0 - in case of error.
|
|
*/
|
|
|
|
sp_head *
|
|
sp_find_routine(THD *thd, int type, sp_name *name, sp_cache **cp,
|
|
bool cache_only)
|
|
{
|
|
sp_head *sp;
|
|
ulong depth= (type == TYPE_ENUM_PROCEDURE ?
|
|
thd->variables.max_sp_recursion_depth :
|
|
0);
|
|
DBUG_ENTER("sp_find_routine");
|
|
DBUG_PRINT("enter", ("name: %.*s.%.*s, type: %d, cache only %d",
|
|
name->m_db.length, name->m_db.str,
|
|
name->m_name.length, name->m_name.str,
|
|
type, cache_only));
|
|
|
|
if ((sp= sp_cache_lookup(cp, name)))
|
|
{
|
|
ulong level;
|
|
sp_head *new_sp;
|
|
const char *returns= "";
|
|
char definer[USER_HOST_BUFF_SIZE];
|
|
|
|
/*
|
|
String buffer for RETURNS data type must have system charset;
|
|
64 -- size of "returns" column of mysql.proc.
|
|
*/
|
|
String retstr(64);
|
|
|
|
DBUG_PRINT("info", ("found: 0x%lx", (ulong)sp));
|
|
if (sp->m_first_free_instance)
|
|
{
|
|
DBUG_PRINT("info", ("first free: 0x%lx, level: %lu, flags %x",
|
|
(ulong)sp->m_first_free_instance,
|
|
sp->m_first_free_instance->m_recursion_level,
|
|
sp->m_first_free_instance->m_flags));
|
|
DBUG_ASSERT(!(sp->m_first_free_instance->m_flags & sp_head::IS_INVOKED));
|
|
if (sp->m_first_free_instance->m_recursion_level > depth)
|
|
{
|
|
sp->recursion_level_error(thd);
|
|
DBUG_RETURN(0);
|
|
}
|
|
DBUG_RETURN(sp->m_first_free_instance);
|
|
}
|
|
/*
|
|
Actually depth could be +1 than the actual value in case a SP calls
|
|
SHOW CREATE PROCEDURE. Hence, the linked list could hold up to one more
|
|
instance.
|
|
*/
|
|
|
|
level= sp->m_last_cached_sp->m_recursion_level + 1;
|
|
if (level > depth)
|
|
{
|
|
sp->recursion_level_error(thd);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
strxmov(definer, sp->m_definer_user.str, "@",
|
|
sp->m_definer_host.str, NullS);
|
|
if (type == TYPE_ENUM_FUNCTION)
|
|
{
|
|
sp_returns_type(thd, retstr, sp);
|
|
returns= retstr.ptr();
|
|
}
|
|
if (db_load_routine(thd, type, name, &new_sp,
|
|
sp->m_sql_mode, sp->m_params.str, returns,
|
|
sp->m_body.str, *sp->m_chistics, definer,
|
|
sp->m_created, sp->m_modified) == SP_OK)
|
|
{
|
|
sp->m_last_cached_sp->m_next_cached_sp= new_sp;
|
|
new_sp->m_recursion_level= level;
|
|
new_sp->m_first_instance= sp;
|
|
sp->m_last_cached_sp= sp->m_first_free_instance= new_sp;
|
|
DBUG_PRINT("info", ("added level: 0x%lx, level: %lu, flags %x",
|
|
(ulong)new_sp, new_sp->m_recursion_level,
|
|
new_sp->m_flags));
|
|
DBUG_RETURN(new_sp);
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
if (!cache_only)
|
|
{
|
|
if (db_find_routine(thd, type, name, &sp) == SP_OK)
|
|
{
|
|
sp_cache_insert(cp, sp);
|
|
DBUG_PRINT("info", ("added new: 0x%lx, level: %lu, flags %x",
|
|
(ulong)sp, sp->m_recursion_level,
|
|
sp->m_flags));
|
|
}
|
|
}
|
|
DBUG_RETURN(sp);
|
|
}
|
|
|
|
|
|
/*
|
|
This is used by sql_acl.cc:mysql_routine_grant() and is used to find
|
|
the routines in 'routines'.
|
|
*/
|
|
|
|
int
|
|
sp_exist_routines(THD *thd, TABLE_LIST *routines, bool any, bool no_error)
|
|
{
|
|
TABLE_LIST *routine;
|
|
bool result= 0;
|
|
bool sp_object_found;
|
|
DBUG_ENTER("sp_exists_routine");
|
|
for (routine= routines; routine; routine= routine->next_global)
|
|
{
|
|
sp_name *name;
|
|
LEX_STRING lex_db;
|
|
LEX_STRING lex_name;
|
|
lex_db.length= strlen(routine->db);
|
|
lex_name.length= strlen(routine->table_name);
|
|
lex_db.str= thd->strmake(routine->db, lex_db.length);
|
|
lex_name.str= thd->strmake(routine->table_name, lex_name.length);
|
|
name= new sp_name(lex_db, lex_name);
|
|
name->init_qname(thd);
|
|
sp_object_found= sp_find_routine(thd, TYPE_ENUM_PROCEDURE, name,
|
|
&thd->sp_proc_cache, FALSE) != NULL ||
|
|
sp_find_routine(thd, TYPE_ENUM_FUNCTION, name,
|
|
&thd->sp_func_cache, FALSE) != NULL;
|
|
mysql_reset_errors(thd, TRUE);
|
|
if (sp_object_found)
|
|
{
|
|
if (any)
|
|
DBUG_RETURN(1);
|
|
result= 1;
|
|
}
|
|
else if (!any)
|
|
{
|
|
if (!no_error)
|
|
{
|
|
my_error(ER_SP_DOES_NOT_EXIST, MYF(0), "FUNCTION or PROCEDURE",
|
|
routine->table_name);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
}
|
|
DBUG_RETURN(result);
|
|
}
|
|
|
|
|
|
/*
|
|
Check if a routine exists in the mysql.proc table, without actually
|
|
parsing the definition. (Used for dropping)
|
|
|
|
SYNOPSIS
|
|
sp_routine_exists_in_table()
|
|
thd - thread context
|
|
name - name of procedure
|
|
|
|
RETURN VALUE
|
|
0 - Success
|
|
non-0 - Error; SP_OPEN_TABLE_FAILED or SP_KEY_NOT_FOUND
|
|
*/
|
|
|
|
int
|
|
sp_routine_exists_in_table(THD *thd, int type, sp_name *name)
|
|
{
|
|
TABLE *table;
|
|
int ret;
|
|
Open_tables_state open_tables_state_backup;
|
|
|
|
if (!(table= open_proc_table_for_read(thd, &open_tables_state_backup)))
|
|
ret= SP_OPEN_TABLE_FAILED;
|
|
else
|
|
{
|
|
if ((ret= db_find_routine_aux(thd, type, name, table)) != SP_OK)
|
|
ret= SP_KEY_NOT_FOUND;
|
|
close_proc_table(thd, &open_tables_state_backup);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
|
|
int
|
|
sp_create_procedure(THD *thd, sp_head *sp)
|
|
{
|
|
int ret;
|
|
DBUG_ENTER("sp_create_procedure");
|
|
DBUG_PRINT("enter", ("name: %.*s", sp->m_name.length, sp->m_name.str));
|
|
|
|
ret= db_create_routine(thd, TYPE_ENUM_PROCEDURE, sp);
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
int
|
|
sp_drop_procedure(THD *thd, sp_name *name)
|
|
{
|
|
int ret;
|
|
DBUG_ENTER("sp_drop_procedure");
|
|
DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
|
|
|
|
ret= db_drop_routine(thd, TYPE_ENUM_PROCEDURE, name);
|
|
if (!ret)
|
|
sp_cache_invalidate();
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
int
|
|
sp_update_procedure(THD *thd, sp_name *name, st_sp_chistics *chistics)
|
|
{
|
|
int ret;
|
|
DBUG_ENTER("sp_update_procedure");
|
|
DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
|
|
|
|
ret= db_update_routine(thd, TYPE_ENUM_PROCEDURE, name, chistics);
|
|
if (!ret)
|
|
sp_cache_invalidate();
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
int
|
|
sp_show_create_procedure(THD *thd, sp_name *name)
|
|
{
|
|
int ret= SP_KEY_NOT_FOUND;
|
|
sp_head *sp;
|
|
DBUG_ENTER("sp_show_create_procedure");
|
|
DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
|
|
|
|
/*
|
|
Increase the recursion limit for this statement. SHOW CREATE PROCEDURE
|
|
does not do actual recursion.
|
|
*/
|
|
thd->variables.max_sp_recursion_depth++;
|
|
if ((sp= sp_find_routine(thd, TYPE_ENUM_PROCEDURE, name,
|
|
&thd->sp_proc_cache, FALSE)))
|
|
ret= sp->show_create_procedure(thd);
|
|
|
|
thd->variables.max_sp_recursion_depth--;
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
int
|
|
sp_show_status_procedure(THD *thd, const char *wild)
|
|
{
|
|
int ret;
|
|
DBUG_ENTER("sp_show_status_procedure");
|
|
|
|
ret= db_show_routine_status(thd, TYPE_ENUM_PROCEDURE, wild);
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
/*****************************************************************************
|
|
FUNCTION
|
|
******************************************************************************/
|
|
|
|
int
|
|
sp_create_function(THD *thd, sp_head *sp)
|
|
{
|
|
int ret;
|
|
DBUG_ENTER("sp_create_function");
|
|
DBUG_PRINT("enter", ("name: %.*s", sp->m_name.length, sp->m_name.str));
|
|
|
|
ret= db_create_routine(thd, TYPE_ENUM_FUNCTION, sp);
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
int
|
|
sp_drop_function(THD *thd, sp_name *name)
|
|
{
|
|
int ret;
|
|
DBUG_ENTER("sp_drop_function");
|
|
DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
|
|
|
|
ret= db_drop_routine(thd, TYPE_ENUM_FUNCTION, name);
|
|
if (!ret)
|
|
sp_cache_invalidate();
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
int
|
|
sp_update_function(THD *thd, sp_name *name, st_sp_chistics *chistics)
|
|
{
|
|
int ret;
|
|
DBUG_ENTER("sp_update_procedure");
|
|
DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
|
|
|
|
ret= db_update_routine(thd, TYPE_ENUM_FUNCTION, name, chistics);
|
|
if (!ret)
|
|
sp_cache_invalidate();
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
int
|
|
sp_show_create_function(THD *thd, sp_name *name)
|
|
{
|
|
sp_head *sp;
|
|
DBUG_ENTER("sp_show_create_function");
|
|
DBUG_PRINT("enter", ("name: %.*s", name->m_name.length, name->m_name.str));
|
|
|
|
if ((sp= sp_find_routine(thd, TYPE_ENUM_FUNCTION, name,
|
|
&thd->sp_func_cache, FALSE)))
|
|
{
|
|
int ret= sp->show_create_function(thd);
|
|
|
|
DBUG_RETURN(ret);
|
|
}
|
|
DBUG_RETURN(SP_KEY_NOT_FOUND);
|
|
}
|
|
|
|
|
|
int
|
|
sp_show_status_function(THD *thd, const char *wild)
|
|
{
|
|
int ret;
|
|
DBUG_ENTER("sp_show_status_function");
|
|
ret= db_show_routine_status(thd, TYPE_ENUM_FUNCTION, wild);
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
/*
|
|
Structure that represents element in the set of stored routines
|
|
used by statement or routine.
|
|
*/
|
|
struct Sroutine_hash_entry;
|
|
|
|
struct Sroutine_hash_entry
|
|
{
|
|
/* Set key consisting of one-byte routine type and quoted routine name. */
|
|
LEX_STRING key;
|
|
/*
|
|
Next element in list linking all routines in set. See also comments
|
|
for LEX::sroutine/sroutine_list and sp_head::m_sroutines.
|
|
*/
|
|
Sroutine_hash_entry *next;
|
|
/*
|
|
Uppermost view which directly or indirectly uses this routine.
|
|
0 if routine is not used in view. Note that it also can be 0 if
|
|
statement uses routine both via view and directly.
|
|
*/
|
|
TABLE_LIST *belong_to_view;
|
|
};
|
|
|
|
|
|
extern "C" byte* sp_sroutine_key(const byte *ptr, uint *plen, my_bool first)
|
|
{
|
|
Sroutine_hash_entry *rn= (Sroutine_hash_entry *)ptr;
|
|
*plen= rn->key.length;
|
|
return (byte *)rn->key.str;
|
|
}
|
|
|
|
|
|
/*
|
|
Check if
|
|
- current statement (the one in thd->lex) needs table prelocking
|
|
- first routine in thd->lex->sroutines_list needs to execute its body in
|
|
prelocked mode.
|
|
|
|
SYNOPSIS
|
|
sp_get_prelocking_info()
|
|
thd Current thread, thd->lex is the statement to be
|
|
checked.
|
|
need_prelocking OUT TRUE - prelocked mode should be activated
|
|
before executing the statement
|
|
FALSE - Don't activate prelocking
|
|
first_no_prelocking OUT TRUE - Tables used by first routine in
|
|
thd->lex->sroutines_list should be
|
|
prelocked.
|
|
FALSE - Otherwise.
|
|
NOTES
|
|
This function assumes that for any "CALL proc(...)" statement routines_list
|
|
will have 'proc' as first element (it may have several, consider e.g.
|
|
"proc(sp_func(...)))". This property is currently guaranted by the parser.
|
|
*/
|
|
|
|
void sp_get_prelocking_info(THD *thd, bool *need_prelocking,
|
|
bool *first_no_prelocking)
|
|
{
|
|
Sroutine_hash_entry *routine;
|
|
routine= (Sroutine_hash_entry*)thd->lex->sroutines_list.first;
|
|
|
|
DBUG_ASSERT(routine);
|
|
bool first_is_procedure= (routine->key.str[0] == TYPE_ENUM_PROCEDURE);
|
|
|
|
*first_no_prelocking= first_is_procedure;
|
|
*need_prelocking= !first_is_procedure || test(routine->next);
|
|
}
|
|
|
|
|
|
/*
|
|
Auxilary function that adds new element to the set of stored routines
|
|
used by statement.
|
|
|
|
SYNOPSIS
|
|
add_used_routine()
|
|
lex LEX representing statement
|
|
arena Arena in which memory for new element will be allocated
|
|
key Key for the hash representing set
|
|
belong_to_view Uppermost view which uses this routine
|
|
(0 if routine is not used by view)
|
|
|
|
NOTES
|
|
Will also add element to end of 'LEX::sroutines_list' list.
|
|
|
|
In case when statement uses stored routines but does not need
|
|
prelocking (i.e. it does not use any tables) we will access the
|
|
elements of LEX::sroutines set on prepared statement re-execution.
|
|
Because of this we have to allocate memory for both hash element
|
|
and copy of its key in persistent arena.
|
|
|
|
TODO
|
|
When we will got rid of these accesses on re-executions we will be
|
|
able to allocate memory for hash elements in non-persitent arena
|
|
and directly use key values from sp_head::m_sroutines sets instead
|
|
of making their copies.
|
|
|
|
RETURN VALUE
|
|
TRUE - new element was added.
|
|
FALSE - element was not added (because it is already present in the set).
|
|
*/
|
|
|
|
static bool add_used_routine(LEX *lex, Query_arena *arena,
|
|
const LEX_STRING *key,
|
|
TABLE_LIST *belong_to_view)
|
|
{
|
|
hash_init_opt(&lex->sroutines, system_charset_info,
|
|
Query_tables_list::START_SROUTINES_HASH_SIZE,
|
|
0, 0, sp_sroutine_key, 0, 0);
|
|
|
|
if (!hash_search(&lex->sroutines, (byte *)key->str, key->length))
|
|
{
|
|
Sroutine_hash_entry *rn=
|
|
(Sroutine_hash_entry *)arena->alloc(sizeof(Sroutine_hash_entry) +
|
|
key->length);
|
|
if (!rn) // OOM. Error will be reported using fatal_error().
|
|
return FALSE;
|
|
rn->key.length= key->length;
|
|
rn->key.str= (char *)rn + sizeof(Sroutine_hash_entry);
|
|
memcpy(rn->key.str, key->str, key->length);
|
|
my_hash_insert(&lex->sroutines, (byte *)rn);
|
|
lex->sroutines_list.link_in_list((byte *)rn, (byte **)&rn->next);
|
|
rn->belong_to_view= belong_to_view;
|
|
return TRUE;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*
|
|
Add routine which is explicitly used by statement to the set of stored
|
|
routines used by this statement.
|
|
|
|
SYNOPSIS
|
|
sp_add_used_routine()
|
|
lex - LEX representing statement
|
|
arena - arena in which memory for new element of the set
|
|
will be allocated
|
|
rt - routine name
|
|
rt_type - routine type (one of TYPE_ENUM_PROCEDURE/...)
|
|
|
|
NOTES
|
|
Will also add element to end of 'LEX::sroutines_list' list (and will
|
|
take into account that this is explicitly used routine).
|
|
|
|
To be friendly towards prepared statements one should pass
|
|
persistent arena as second argument.
|
|
*/
|
|
|
|
void sp_add_used_routine(LEX *lex, Query_arena *arena,
|
|
sp_name *rt, char rt_type)
|
|
{
|
|
rt->set_routine_type(rt_type);
|
|
(void)add_used_routine(lex, arena, &rt->m_sroutines_key, 0);
|
|
lex->sroutines_list_own_last= lex->sroutines_list.next;
|
|
lex->sroutines_list_own_elements= lex->sroutines_list.elements;
|
|
}
|
|
|
|
|
|
/*
|
|
Remove routines which are only indirectly used by statement from
|
|
the set of routines used by this statement.
|
|
|
|
SYNOPSIS
|
|
sp_remove_not_own_routines()
|
|
lex LEX representing statement
|
|
*/
|
|
|
|
void sp_remove_not_own_routines(LEX *lex)
|
|
{
|
|
Sroutine_hash_entry *not_own_rt, *next_rt;
|
|
for (not_own_rt= *(Sroutine_hash_entry **)lex->sroutines_list_own_last;
|
|
not_own_rt; not_own_rt= next_rt)
|
|
{
|
|
/*
|
|
It is safe to obtain not_own_rt->next after calling hash_delete() now
|
|
but we want to be more future-proof.
|
|
*/
|
|
next_rt= not_own_rt->next;
|
|
hash_delete(&lex->sroutines, (byte *)not_own_rt);
|
|
}
|
|
|
|
*(Sroutine_hash_entry **)lex->sroutines_list_own_last= NULL;
|
|
lex->sroutines_list.next= lex->sroutines_list_own_last;
|
|
lex->sroutines_list.elements= lex->sroutines_list_own_elements;
|
|
}
|
|
|
|
|
|
/*
|
|
Merge contents of two hashes representing sets of routines used
|
|
by statements or by other routines.
|
|
|
|
SYNOPSIS
|
|
sp_update_sp_used_routines()
|
|
dst - hash to which elements should be added
|
|
src - hash from which elements merged
|
|
|
|
NOTE
|
|
This procedure won't create new Sroutine_hash_entry objects,
|
|
instead it will simply add elements from source to destination
|
|
hash. Thus time of life of elements in destination hash becomes
|
|
dependant on time of life of elements from source hash. It also
|
|
won't touch lists linking elements in source and destination
|
|
hashes.
|
|
*/
|
|
|
|
void sp_update_sp_used_routines(HASH *dst, HASH *src)
|
|
{
|
|
for (uint i=0 ; i < src->records ; i++)
|
|
{
|
|
Sroutine_hash_entry *rt= (Sroutine_hash_entry *)hash_element(src, i);
|
|
if (!hash_search(dst, (byte *)rt->key.str, rt->key.length))
|
|
my_hash_insert(dst, (byte *)rt);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
Add contents of hash representing set of routines to the set of
|
|
routines used by statement.
|
|
|
|
SYNOPSIS
|
|
sp_update_stmt_used_routines()
|
|
thd Thread context
|
|
lex LEX representing statement
|
|
src Hash representing set from which routines will be added
|
|
belong_to_view Uppermost view which uses these routines, 0 if none
|
|
|
|
NOTE
|
|
It will also add elements to end of 'LEX::sroutines_list' list.
|
|
*/
|
|
|
|
static void
|
|
sp_update_stmt_used_routines(THD *thd, LEX *lex, HASH *src,
|
|
TABLE_LIST *belong_to_view)
|
|
{
|
|
for (uint i=0 ; i < src->records ; i++)
|
|
{
|
|
Sroutine_hash_entry *rt= (Sroutine_hash_entry *)hash_element(src, i);
|
|
(void)add_used_routine(lex, thd->stmt_arena, &rt->key, belong_to_view);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
Add contents of list representing set of routines to the set of
|
|
routines used by statement.
|
|
|
|
SYNOPSIS
|
|
sp_update_stmt_used_routines()
|
|
thd Thread context
|
|
lex LEX representing statement
|
|
src List representing set from which routines will be added
|
|
belong_to_view Uppermost view which uses these routines, 0 if none
|
|
|
|
NOTE
|
|
It will also add elements to end of 'LEX::sroutines_list' list.
|
|
*/
|
|
|
|
static void sp_update_stmt_used_routines(THD *thd, LEX *lex, SQL_LIST *src,
|
|
TABLE_LIST *belong_to_view)
|
|
{
|
|
for (Sroutine_hash_entry *rt= (Sroutine_hash_entry *)src->first;
|
|
rt; rt= rt->next)
|
|
(void)add_used_routine(lex, thd->stmt_arena, &rt->key, belong_to_view);
|
|
}
|
|
|
|
|
|
/*
|
|
Cache sub-set of routines used by statement, add tables used by these
|
|
routines to statement table list. Do the same for all routines used
|
|
by these routines.
|
|
|
|
SYNOPSIS
|
|
sp_cache_routines_and_add_tables_aux()
|
|
thd - thread context
|
|
lex - LEX representing statement
|
|
start - first routine from the list of routines to be cached
|
|
(this list defines mentioned sub-set).
|
|
first_no_prelock - If true, don't add tables or cache routines used by
|
|
the body of the first routine (i.e. *start)
|
|
will be executed in non-prelocked mode.
|
|
NOTE
|
|
If some function is missing this won't be reported here.
|
|
Instead this fact will be discovered during query execution.
|
|
|
|
RETURN VALUE
|
|
0 - success
|
|
non-0 - failure
|
|
*/
|
|
|
|
static int
|
|
sp_cache_routines_and_add_tables_aux(THD *thd, LEX *lex,
|
|
Sroutine_hash_entry *start,
|
|
bool first_no_prelock)
|
|
{
|
|
int ret= 0;
|
|
bool first= TRUE;
|
|
DBUG_ENTER("sp_cache_routines_and_add_tables_aux");
|
|
|
|
for (Sroutine_hash_entry *rt= start; rt; rt= rt->next)
|
|
{
|
|
sp_name name(rt->key.str, rt->key.length);
|
|
int type= rt->key.str[0];
|
|
sp_head *sp;
|
|
|
|
if (!(sp= sp_cache_lookup((type == TYPE_ENUM_FUNCTION ?
|
|
&thd->sp_func_cache : &thd->sp_proc_cache),
|
|
&name)))
|
|
{
|
|
name.m_name.str= strchr(name.m_qname.str, '.');
|
|
name.m_db.length= name.m_name.str - name.m_qname.str;
|
|
name.m_db.str= strmake_root(thd->mem_root, name.m_qname.str,
|
|
name.m_db.length);
|
|
name.m_name.str+= 1;
|
|
name.m_name.length= name.m_qname.length - name.m_db.length - 1;
|
|
|
|
switch ((ret= db_find_routine(thd, type, &name, &sp)))
|
|
{
|
|
case SP_OK:
|
|
{
|
|
if (type == TYPE_ENUM_FUNCTION)
|
|
sp_cache_insert(&thd->sp_func_cache, sp);
|
|
else
|
|
sp_cache_insert(&thd->sp_proc_cache, sp);
|
|
}
|
|
break;
|
|
case SP_KEY_NOT_FOUND:
|
|
ret= SP_OK;
|
|
break;
|
|
default:
|
|
/*
|
|
Any error when loading an existing routine is either some problem
|
|
with the mysql.proc table, or a parse error because the contents
|
|
has been tampered with (in which case we clear that error).
|
|
*/
|
|
if (ret == SP_PARSE_ERROR)
|
|
thd->clear_error();
|
|
/*
|
|
If we cleared the parse error, or when db_find_routine() flagged
|
|
an error with it's return value without calling my_error(), we
|
|
set the generic "mysql.proc table corrupt" error here.
|
|
*/
|
|
if (!thd->net.report_error)
|
|
{
|
|
/*
|
|
SP allows full NAME_LEN chars thus he have to allocate enough
|
|
size in bytes. Otherwise there is stack overrun could happen
|
|
if multibyte sequence is `name`. `db` is still safe because the
|
|
rest of the server checks agains NAME_LEN bytes and not chars.
|
|
Hence, the overrun happens only if the name is in length > 32 and
|
|
uses multibyte (cyrillic, greek, etc.)
|
|
|
|
!! Change 3 with SYSTEM_CHARSET_MBMAXLEN when it's defined.
|
|
*/
|
|
char n[NAME_LEN*3*2+2];
|
|
|
|
/* m_qname.str is not always \0 terminated */
|
|
memcpy(n, name.m_qname.str, name.m_qname.length);
|
|
n[name.m_qname.length]= '\0';
|
|
my_error(ER_SP_PROC_TABLE_CORRUPT, MYF(0), n, ret);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
if (sp)
|
|
{
|
|
if (!(first && first_no_prelock))
|
|
{
|
|
sp_update_stmt_used_routines(thd, lex, &sp->m_sroutines,
|
|
rt->belong_to_view);
|
|
(void)sp->add_used_tables_to_table_list(thd, &lex->query_tables_last,
|
|
rt->belong_to_view);
|
|
}
|
|
sp->propagate_attributes(lex);
|
|
}
|
|
first= FALSE;
|
|
}
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|
|
|
|
/*
|
|
Cache all routines from the set of used by statement, add tables used
|
|
by those routines to statement table list. Do the same for all routines
|
|
used by those routines.
|
|
|
|
SYNOPSIS
|
|
sp_cache_routines_and_add_tables()
|
|
thd - thread context
|
|
lex - LEX representing statement
|
|
first_no_prelock - If true, don't add tables or cache routines used by
|
|
the body of the first routine (i.e. *start)
|
|
|
|
RETURN VALUE
|
|
0 - success
|
|
non-0 - failure
|
|
*/
|
|
|
|
int
|
|
sp_cache_routines_and_add_tables(THD *thd, LEX *lex, bool first_no_prelock)
|
|
{
|
|
return sp_cache_routines_and_add_tables_aux(thd, lex,
|
|
(Sroutine_hash_entry *)lex->sroutines_list.first,
|
|
first_no_prelock);
|
|
}
|
|
|
|
|
|
/*
|
|
Add all routines used by view to the set of routines used by statement.
|
|
Add tables used by those routines to statement table list. Do the same
|
|
for all routines used by these routines.
|
|
|
|
SYNOPSIS
|
|
sp_cache_routines_and_add_tables_for_view()
|
|
thd Thread context
|
|
lex LEX representing statement
|
|
view Table list element representing view
|
|
|
|
RETURN VALUE
|
|
0 - success
|
|
non-0 - failure
|
|
*/
|
|
|
|
int
|
|
sp_cache_routines_and_add_tables_for_view(THD *thd, LEX *lex, TABLE_LIST *view)
|
|
{
|
|
Sroutine_hash_entry **last_cached_routine_ptr=
|
|
(Sroutine_hash_entry **)lex->sroutines_list.next;
|
|
sp_update_stmt_used_routines(thd, lex, &view->view->sroutines_list,
|
|
view->top_table());
|
|
return sp_cache_routines_and_add_tables_aux(thd, lex,
|
|
*last_cached_routine_ptr, FALSE);
|
|
}
|
|
|
|
|
|
/*
|
|
Add triggers for table to the set of routines used by statement.
|
|
Add tables used by them to statement table list. Do the same for
|
|
all implicitly used routines.
|
|
|
|
SYNOPSIS
|
|
sp_cache_routines_and_add_tables_for_triggers()
|
|
thd thread context
|
|
lex LEX respresenting statement
|
|
table Table list element for table with trigger
|
|
|
|
RETURN VALUE
|
|
0 - success
|
|
non-0 - failure
|
|
*/
|
|
|
|
int
|
|
sp_cache_routines_and_add_tables_for_triggers(THD *thd, LEX *lex,
|
|
TABLE_LIST *table)
|
|
{
|
|
int ret= 0;
|
|
Table_triggers_list *triggers= table->table->triggers;
|
|
if (add_used_routine(lex, thd->stmt_arena, &triggers->sroutines_key,
|
|
table->belong_to_view))
|
|
{
|
|
Sroutine_hash_entry **last_cached_routine_ptr=
|
|
(Sroutine_hash_entry **)lex->sroutines_list.next;
|
|
for (int i= 0; i < (int)TRG_EVENT_MAX; i++)
|
|
{
|
|
for (int j= 0; j < (int)TRG_ACTION_MAX; j++)
|
|
{
|
|
sp_head *trigger_body= triggers->bodies[i][j];
|
|
if (trigger_body)
|
|
{
|
|
(void)trigger_body->
|
|
add_used_tables_to_table_list(thd, &lex->query_tables_last,
|
|
table->belong_to_view);
|
|
sp_update_stmt_used_routines(thd, lex,
|
|
&trigger_body->m_sroutines,
|
|
table->belong_to_view);
|
|
trigger_body->propagate_attributes(lex);
|
|
}
|
|
}
|
|
}
|
|
ret= sp_cache_routines_and_add_tables_aux(thd, lex,
|
|
*last_cached_routine_ptr, FALSE);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
|
|
/*
|
|
* Generates the CREATE... string from the table information.
|
|
* Returns TRUE on success, FALSE on (alloc) failure.
|
|
*/
|
|
static bool
|
|
create_string(THD *thd, String *buf,
|
|
int type,
|
|
sp_name *name,
|
|
const char *params, ulong paramslen,
|
|
const char *returns, ulong returnslen,
|
|
const char *body, ulong bodylen,
|
|
st_sp_chistics *chistics,
|
|
const LEX_STRING *definer_user,
|
|
const LEX_STRING *definer_host)
|
|
{
|
|
/* Make some room to begin with */
|
|
if (buf->alloc(100 + name->m_qname.length + paramslen + returnslen + bodylen +
|
|
chistics->comment.length + 10 /* length of " DEFINER= "*/ +
|
|
USER_HOST_BUFF_SIZE))
|
|
return FALSE;
|
|
|
|
buf->append(STRING_WITH_LEN("CREATE "));
|
|
append_definer(thd, buf, definer_user, definer_host);
|
|
if (type == TYPE_ENUM_FUNCTION)
|
|
buf->append(STRING_WITH_LEN("FUNCTION "));
|
|
else
|
|
buf->append(STRING_WITH_LEN("PROCEDURE "));
|
|
append_identifier(thd, buf, name->m_name.str, name->m_name.length);
|
|
buf->append('(');
|
|
buf->append(params, paramslen);
|
|
buf->append(')');
|
|
if (type == TYPE_ENUM_FUNCTION)
|
|
{
|
|
buf->append(STRING_WITH_LEN(" RETURNS "));
|
|
buf->append(returns, returnslen);
|
|
}
|
|
buf->append('\n');
|
|
switch (chistics->daccess) {
|
|
case SP_NO_SQL:
|
|
buf->append(STRING_WITH_LEN(" NO SQL\n"));
|
|
break;
|
|
case SP_READS_SQL_DATA:
|
|
buf->append(STRING_WITH_LEN(" READS SQL DATA\n"));
|
|
break;
|
|
case SP_MODIFIES_SQL_DATA:
|
|
buf->append(STRING_WITH_LEN(" MODIFIES SQL DATA\n"));
|
|
break;
|
|
case SP_DEFAULT_ACCESS:
|
|
case SP_CONTAINS_SQL:
|
|
/* Do nothing */
|
|
break;
|
|
}
|
|
if (chistics->detistic)
|
|
buf->append(STRING_WITH_LEN(" DETERMINISTIC\n"));
|
|
if (chistics->suid == SP_IS_NOT_SUID)
|
|
buf->append(STRING_WITH_LEN(" SQL SECURITY INVOKER\n"));
|
|
if (chistics->comment.length)
|
|
{
|
|
buf->append(STRING_WITH_LEN(" COMMENT "));
|
|
append_unescaped(buf, chistics->comment.str, chistics->comment.length);
|
|
buf->append('\n');
|
|
}
|
|
buf->append(body, bodylen);
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
Change the current database if needed.
|
|
|
|
SYNOPSIS
|
|
sp_use_new_db()
|
|
thd thread handle
|
|
|
|
new_db new database name (a string and its length)
|
|
|
|
old_db [IN] str points to a buffer where to store the old
|
|
database, length contains the size of the buffer
|
|
[OUT] if old db was not NULL, its name is copied
|
|
to the buffer pointed at by str and length is updated
|
|
accordingly. Otherwise str[0] is set to '\0' and length
|
|
is set to 0. The out parameter should be used only if
|
|
the database name has been changed (see dbchangedp).
|
|
|
|
dbchangedp [OUT] is set to TRUE if the current database is changed,
|
|
FALSE otherwise. A database is not changed if the old
|
|
name is the same as the new one, both names are empty,
|
|
or an error has occurred.
|
|
|
|
RETURN VALUE
|
|
0 success
|
|
1 access denied or out of memory (the error message is
|
|
set in THD)
|
|
*/
|
|
|
|
int
|
|
sp_use_new_db(THD *thd, LEX_STRING new_db, LEX_STRING *old_db,
|
|
bool no_access_check, bool *dbchangedp)
|
|
{
|
|
int ret;
|
|
DBUG_ENTER("sp_use_new_db");
|
|
DBUG_PRINT("enter", ("newdb: %s", new_db.str));
|
|
|
|
/*
|
|
Set new_db to an empty string if it's NULL, because mysql_change_db
|
|
requires a non-NULL argument.
|
|
new_db.str can be NULL only if we're restoring the old database after
|
|
execution of a stored procedure and there were no current database
|
|
selected. The stored procedure itself must always have its database
|
|
initialized.
|
|
*/
|
|
if (new_db.str == NULL)
|
|
new_db.str= empty_c_string;
|
|
|
|
if (thd->db)
|
|
{
|
|
old_db->length= (strmake(old_db->str, thd->db, old_db->length) -
|
|
old_db->str);
|
|
}
|
|
else
|
|
{
|
|
old_db->str[0]= '\0';
|
|
old_db->length= 0;
|
|
}
|
|
|
|
/* Don't change the database if the new name is the same as the old one. */
|
|
if (my_strcasecmp(system_charset_info, old_db->str, new_db.str) == 0)
|
|
{
|
|
*dbchangedp= FALSE;
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
ret= mysql_change_db(thd, new_db.str, no_access_check);
|
|
|
|
*dbchangedp= ret == 0;
|
|
DBUG_RETURN(ret);
|
|
}
|
|
|