mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
4dabfa5de7
into mysql.com:/home/kent/bk/main/mysql-5.1 BUILD/Makefile.am: Auto merged BitKeeper/deleted/.del-ArrayFifoList.hpp~7036ae04dd7e7bd2: Auto merged BitKeeper/deleted/.del-ArrayList.hpp~44695d09b1a02179: Auto merged BitKeeper/deleted/.del-DbtupLCP.cpp~855b1ed3fbc86a42: Auto merged BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d: Auto merged BitKeeper/deleted/.del-DbtupUndoLog.cpp~5a2ef6e86b1404e9: Auto merged Makefile.am: Auto merged BitKeeper/deleted/.del-Makefile.am~2: Auto merged BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e: Auto merged BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7: Auto merged BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6: Auto merged BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713: Auto merged BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c: Auto merged BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f: Auto merged BitKeeper/deleted/.del-Makefile.in: Auto merged BitKeeper/deleted/.del-MemoryChannelOSE.hpp: Auto merged BitKeeper/deleted/.del-MetaData.cpp~146ae9865dd35829: Auto merged BitKeeper/deleted/.del-MetaData.hpp~538342afcd8ac53c: Auto merged BitKeeper/deleted/.del-NdbCondition.c~ad83464328ab37af: Auto merged BitKeeper/deleted/.del-NdbCondition.c~ee56562abdd718cf: Auto merged BitKeeper/deleted/.del-NdbConditionOSE.h~455dd2c29c2e6344: Auto merged BitKeeper/deleted/.del-NdbDaemon.c~3b8101f376b28df: Auto merged BitKeeper/deleted/.del-NdbEnv.c~207f9ce9754c9e8a: Auto merged BitKeeper/deleted/.del-NdbEnv.c~bb6fe7572d45288a: Auto merged BitKeeper/deleted/.del-NdbErrHnd.cpp: Auto merged BitKeeper/deleted/.del-NdbHost.c~2c29816c77396d7b: Auto merged BitKeeper/deleted/.del-NdbHost.c~cf18d6b3c825180c: Auto merged BitKeeper/deleted/.del-NdbMem.c~6285b159985d46da: Auto merged BitKeeper/deleted/.del-NdbMem.c~6c2b317c1ce230ab: Auto merged BitKeeper/deleted/.del-NdbMem_SoftOse.cpp~9c61e311ec168d44: Auto merged BitKeeper/deleted/.del-NdbMutex.c~768131269bccca10: Auto merged BitKeeper/deleted/.del-NdbMutex.c~f4bdd19be08b84ab: Auto merged BitKeeper/deleted/.del-NdbOut.cpp~8caa99a0d729540c: Auto merged BitKeeper/deleted/.del-NdbSleep.c~b643ea3e7103eb62: Auto merged BitKeeper/deleted/.del-NdbSleep.c~b88fbc5b140de10d: Auto merged BitKeeper/deleted/.del-NdbTCP.c~1e9f416992352f6d: Auto merged BitKeeper/deleted/.del-NdbTCP.c~b09cdcbef3ea2c57: Auto merged BitKeeper/deleted/.del-NdbThread.c~2fe1fa5f47801772: Auto merged BitKeeper/deleted/.del-NdbThread.c~fe71a67b5c3a4724: Auto merged BitKeeper/deleted/.del-NdbTick.c~aa6385567216509d: Auto merged BitKeeper/deleted/.del-NdbTick.c~b76feba2cf1493d1: Auto merged BitKeeper/deleted/.del-OSE_Receiver.cpp: Auto merged BitKeeper/deleted/.del-OSE_Receiver.hpp: Auto merged BitKeeper/deleted/.del-OSE_Signals.hpp: Auto merged BitKeeper/deleted/.del-OSE_Transporter.cpp: Auto merged BitKeeper/deleted/.del-OSE_Transporter.hpp: Auto merged BitKeeper/deleted/.del-TraceNdbApi.hpp~7a7f0ae5b70358bc: Auto merged BitKeeper/deleted/.del-VerifyNdbApi.hpp~f417f78f7cd05935: Auto merged BitKeeper/deleted/.del-bcd.h~81fbfcc1530534da: Auto merged BitKeeper/deleted/.del-config-os2.h~a16b51851ddd317b: Auto merged BitKeeper/deleted/.del-dbGenerator.c~7509c19f70cad0bf: Auto merged BitKeeper/deleted/.del-dbGenerator.h~63f1aeb98260bcb7: Auto merged BitKeeper/deleted/.del-dbGenerator.h~e1aaa6725999d458: Auto merged BitKeeper/deleted/.del-dbPopulate.c~5dcff1c99783d83b: Auto merged BitKeeper/deleted/.del-dbPopulate.h~229a894b59d4da73: Auto merged BitKeeper/deleted/.del-ha_berkeley.cc: Auto merged BitKeeper/deleted/.del-ha_berkeley.h: Auto merged BitKeeper/deleted/.del-localDbPrepare.c~33a2c46afc8fac9a: Auto merged BitKeeper/deleted/.del-macros.h~58097d584e29b5df: Auto merged BitKeeper/deleted/.del-macros.h~742871fab0681964: Auto merged BitKeeper/deleted/.del-mainGenerator.c~2d1c8016f72b2517: Auto merged BitKeeper/deleted/.del-mainPopulate.c~37def9a44980b8ec: Auto merged BitKeeper/deleted/.del-mgmapi_logevent.cpp~f1e7cf3e70edc4: Auto merged BitKeeper/deleted/.del-mmslist.cpp: Auto merged BitKeeper/deleted/.del-my_lread.c: Auto merged BitKeeper/deleted/.del-my_lwrite.c: Auto merged BitKeeper/deleted/.del-my_os2cond.c~e3b520af1c371bb5: Auto merged BitKeeper/deleted/.del-my_os2dirsrch.c~4e2479b2abb2eb5a: Auto merged BitKeeper/deleted/.del-my_os2dirsrch.h~5011cbc657537d0: Auto merged BitKeeper/deleted/.del-my_os2dlfcn.c~6d94b488717683dd: Auto merged BitKeeper/deleted/.del-my_os2dlfcn.h0~eae8edb8555eff87: Auto merged BitKeeper/deleted/.del-my_os2file64.c~251fb8a1e950c31b: Auto merged BitKeeper/deleted/.del-my_os2thread.c~65dca991548cec2a: Auto merged BitKeeper/deleted/.del-my_os2tls.c~58ade7a0f70ad5ea: Auto merged BitKeeper/deleted/.del-mysqlmanager-pwgen.c~d8f5f91ec54432b9: Auto merged BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Auto merged BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6: Auto merged BitKeeper/deleted/.del-ndb_error.hpp~24468bb7f20a0b41: Auto merged BitKeeper/deleted/.del-ndb_error.hpp~45a2fef922beae3: Auto merged BitKeeper/deleted/.del-ndb_schema.hpp~de9c21185d6bfe4e: Auto merged BitKeeper/deleted/.del-ndbapi_async.cpp~319189569fb659ec: Auto merged BitKeeper/deleted/.del-ndbapi_async1.cpp~2995dac9b963a0d: Auto merged BitKeeper/deleted/.del-ndbapi_event.cpp~c5d949802966180: Auto merged BitKeeper/deleted/.del-ndbapi_retries.cpp~7301496d8c1c310a: Auto merged BitKeeper/deleted/.del-ndbapi_scan.cpp~14ed2aa9a5d9e597: Auto merged BitKeeper/deleted/.del-ndbapi_simple.cpp~80962179f3c2f5b8: Auto merged BitKeeper/deleted/.del-ndbapi_simple_index.cpp~4b95a4d71808b5b6: Auto merged BitKeeper/deleted/.del-print-limit-table~b8e808031daa3758: Auto merged BitKeeper/deleted/.del-raid.cc~488f5fa6538394e1: Auto merged BitKeeper/deleted/.del-raid.h~2d2503a66b128ac6: Auto merged BitKeeper/deleted/.del-raid2.c~fe7aea5fb4b9748c: Auto merged BitKeeper/deleted/.del-sql_manager.h: Auto merged BitKeeper/deleted/.del-testData.h~696038ea2623a90b: Auto merged BitKeeper/deleted/.del-testData.h~898b71d7c639319e: Auto merged BitKeeper/deleted/.del-testDefinitions.h~f18a4553579a3725: Auto merged BitKeeper/deleted/.del-userHandle.h~3275bb415e1ca2c2: Auto merged BitKeeper/deleted/.del-userHandle.h~ec22dc7a7ed2f81b: Auto merged BitKeeper/deleted/.del-userInterface.cpp~82ee612ab14b3d48: Auto merged BitKeeper/deleted/.del-userInterface.c~92a20032f7d1e91: Auto merged BitKeeper/deleted/.del-userInterface.h~1f76ad2f28b283fd: Auto merged BitKeeper/deleted/.del-userInterface.h~49139f029bbdaabc: Auto merged BitKeeper/deleted/.del-userTransaction.c~438012ecc761b776: Auto merged BitKeeper/deleted/.del-userTransaction.c~f50661b4f54b0bdd: Auto merged BitKeeper/deleted/.del-utv.h~f64af026b9705ebb: Auto merged BitKeeper/deleted/.del-vcdrfunc.h~85803875180684cd: Auto merged BitKeeper/deleted/.del-waiter.cpp~b188e4bfddf2cf98: Auto merged Docs/Makefile.am: Auto merged client/Makefile.am: Auto merged client/client_priv.h: Auto merged client/get_password.c: Auto merged client/mysql.cc: Auto merged client/mysql_upgrade.c: Auto merged client/mysqladmin.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged dbug/Makefile.am: Auto merged extra/Makefile.am: Auto merged extra/comp_err.c: Auto merged extra/perror.c: Auto merged extra/replace.c: Auto merged extra/resolveip.c: Auto merged include/Makefile.am: Auto merged include/base64.h: Auto merged include/config-netware.h: Auto merged include/config-win.h: Auto merged include/decimal.h: Auto merged include/errmsg.h: Auto merged include/ft_global.h: Auto merged include/heap.h: Auto merged include/m_ctype.h: Auto merged include/m_string.h: Auto merged include/my_base.h: Auto merged include/my_bitmap.h: Auto merged include/my_dbug.h: Auto merged include/my_global.h: Auto merged include/my_net.h: Auto merged include/my_no_pthread.h: Auto merged include/my_nosys.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/my_time.h: Auto merged include/my_tree.h: Auto merged include/my_xml.h: Auto merged include/myisam.h: Auto merged include/myisammrg.h: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged include/mysys_err.h: Auto merged include/queues.h: Auto merged include/thr_alarm.h: Auto merged include/thr_lock.h: Auto merged include/violite.h: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/emb_qcache.cc: Auto merged libmysqld/embedded_priv.h: Auto merged libmysqld/examples/Makefile.am: Auto merged libmysqld/libmysqld.c: Auto merged mysql-test/Makefile.am: Auto merged mysys/Makefile.am: Auto merged mysys/array.c: Auto merged mysys/base64.c: Auto merged mysys/charset-def.c: Auto merged mysys/default.c: Auto merged mysys/default_modify.c: Auto merged mysys/errors.c: Auto merged mysys/hash.c: Auto merged mysys/mf_dirname.c: Auto merged mysys/mf_format.c: Auto merged mysys/mf_iocache.c: Auto merged mysys/mf_iocache2.c: Auto merged mysys/mf_keycache.c: Auto merged mysys/mf_pack.c: Auto merged mysys/mf_path.c: Auto merged mysys/mf_tempdir.c: Auto merged mysys/mf_tempfile.c: Auto merged mysys/my_access.c: Auto merged mysys/my_alloc.c: Auto merged mysys/my_append.c: Auto merged mysys/my_bit.c: Auto merged mysys/my_bitmap.c: Auto merged mysys/my_clock.c: Auto merged mysys/my_compress.c: Auto merged mysys/my_copy.c: Auto merged mysys/my_create.c: Auto merged mysys/my_dup.c: Auto merged mysys/my_error.c: Auto merged mysys/my_file.c: Auto merged mysys/my_gethostbyname.c: Auto merged mysys/my_getopt.c: Auto merged mysys/my_getwd.c: Auto merged mysys/my_handler.c: Auto merged mysys/my_init.c: Auto merged mysys/my_lib.c: Auto merged mysys/my_lock.c: Auto merged mysys/my_malloc.c: Auto merged mysys/my_mkdir.c: Auto merged mysys/my_mmap.c: Auto merged mysys/my_net.c: Auto merged mysys/my_once.c: Auto merged mysys/my_open.c: Auto merged mysys/my_pread.c: Auto merged mysys/my_pthread.c: Auto merged mysys/my_redel.c: Auto merged mysys/my_rename.c: Auto merged mysys/my_seek.c: Auto merged mysys/my_sleep.c: Auto merged mysys/my_static.c: Auto merged mysys/my_symlink2.c: Auto merged mysys/my_thr_init.c: Auto merged mysys/mysys_priv.h: Auto merged mysys/ptr_cmp.c: Auto merged mysys/queues.c: Auto merged mysys/safemalloc.c: Auto merged mysys/string.c: Auto merged mysys/test_dir.c: Auto merged mysys/testhash.c: Auto merged mysys/thr_alarm.c: Auto merged mysys/thr_lock.c: Auto merged mysys/thr_mutex.c: Auto merged regex/Makefile.am: Auto merged scripts/Makefile.am: Auto merged server-tools/instance-manager/Makefile.am: Auto merged server-tools/instance-manager/buffer.cc: Auto merged server-tools/instance-manager/command.cc: Auto merged server-tools/instance-manager/command.h: Auto merged server-tools/instance-manager/commands.cc: Auto merged server-tools/instance-manager/commands.h: Auto merged server-tools/instance-manager/guardian.cc: Auto merged server-tools/instance-manager/guardian.h: Auto merged server-tools/instance-manager/instance.cc: Auto merged server-tools/instance-manager/instance.h: Auto merged server-tools/instance-manager/instance_map.cc: Auto merged server-tools/instance-manager/instance_map.h: Auto merged server-tools/instance-manager/instance_options.cc: Auto merged server-tools/instance-manager/instance_options.h: Auto merged server-tools/instance-manager/listener.cc: Auto merged server-tools/instance-manager/listener.h: Auto merged server-tools/instance-manager/log.cc: Auto merged server-tools/instance-manager/log.h: Auto merged server-tools/instance-manager/manager.cc: Auto merged server-tools/instance-manager/manager.h: Auto merged server-tools/instance-manager/messages.cc: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged server-tools/instance-manager/mysql_connection.h: Auto merged server-tools/instance-manager/mysql_manager_error.h: Auto merged server-tools/instance-manager/mysqlmanager.cc: Auto merged server-tools/instance-manager/options.cc: Auto merged server-tools/instance-manager/options.h: Auto merged server-tools/instance-manager/parse.cc: Auto merged server-tools/instance-manager/parse.h: Auto merged server-tools/instance-manager/parse_output.cc: Auto merged server-tools/instance-manager/parse_output.h: Auto merged server-tools/instance-manager/priv.cc: Auto merged server-tools/instance-manager/priv.h: Auto merged server-tools/instance-manager/protocol.cc: Auto merged server-tools/instance-manager/protocol.h: Auto merged server-tools/instance-manager/thread_registry.cc: Auto merged server-tools/instance-manager/thread_registry.h: Auto merged server-tools/instance-manager/user_map.cc: Auto merged server-tools/instance-manager/user_map.h: Auto merged sql/Makefile.am: Auto merged sql/discover.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/field_conv.cc: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/init.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_create.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_geofunc.cc: Auto merged sql/item_geofunc.h: Auto merged sql/item_row.cc: Auto merged sql/item_row.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/item_uniq.cc: Auto merged sql/key.cc: Auto merged sql/lex.h: Auto merged sql/lex_symbol.h: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/my_decimal.cc: Auto merged sql/my_decimal.h: Auto merged sql/my_lock.c: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/parse_file.cc: Auto merged sql/parse_file.h: Auto merged sql/password.c: Auto merged sql/procedure.h: Auto merged sql/protocol.cc: Auto merged sql/protocol.h: Auto merged sql/records.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sp.cc: Auto merged sql/sp.h: Auto merged sql/sp_cache.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/spatial.cc: Auto merged sql/spatial.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_analyse.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_bitmap.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_crypt.cc: Auto merged sql/sql_cursor.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_derived.cc: Auto merged sql/sql_do.cc: Auto merged sql/sql_error.cc: Auto merged sql/sql_error.h: Auto merged sql/sql_handler.cc: Auto merged sql/sql_help.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_manager.cc: Auto merged sql/sql_map.cc: Auto merged sql/sql_olap.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_string.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_trigger.h: Auto merged sql/sql_udf.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql-bench/Makefile.am: Auto merged sql-bench/as3ap.sh: Auto merged sql-bench/bench-count-distinct.sh: Auto merged sql-bench/bench-init.pl.sh: Auto merged sql-bench/compare-results.sh: Auto merged sql-bench/copy-db.sh: Auto merged sql/share/charsets/Index.xml: Auto merged sql/share/charsets/cp1250.xml: Auto merged sql/sql_view.h: Auto merged sql/sql_yacc.yy: Auto merged sql/stacktrace.c: Auto merged sql/stacktrace.h: Auto merged sql/strfunc.cc: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/time.cc: Auto merged sql/tztime.cc: Auto merged sql/tztime.h: Auto merged sql/udf_example.c: Auto merged sql/unireg.cc: Auto merged sql/unireg.h: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/run-all-tests.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql-bench/test-ATIS.sh: Auto merged sql-bench/test-alter-table.sh: Auto merged sql-bench/test-big-tables.sh: Auto merged sql-bench/test-connect.sh: Auto merged sql-bench/test-create.sh: Auto merged sql-bench/test-insert.sh: Auto merged sql-bench/test-select.sh: Auto merged sql-bench/test-transactions.sh: Auto merged sql-bench/test-wisconsin.sh: Auto merged sql-common/client.c: Auto merged sql-common/my_time.c: Auto merged storage/archive/ha_archive.cc: Auto merged storage/archive/ha_archive.h: Auto merged storage/blackhole/ha_blackhole.cc: Auto merged storage/blackhole/ha_blackhole.h: Auto merged storage/csv/ha_tina.cc: Auto merged storage/csv/ha_tina.h: Auto merged storage/example/ha_example.cc: Auto merged storage/example/ha_example.h: Auto merged storage/federated/ha_federated.cc: Auto merged storage/federated/ha_federated.h: Auto merged storage/heap/Makefile.am: Auto merged storage/heap/_check.c: Auto merged storage/heap/_rectest.c: Auto merged storage/heap/ha_heap.cc: Auto merged storage/heap/ha_heap.h: Auto merged storage/heap/heapdef.h: Auto merged storage/heap/hp_block.c: Auto merged storage/heap/hp_clear.c: Auto merged storage/heap/hp_close.c: Auto merged storage/heap/hp_create.c: Auto merged storage/heap/hp_delete.c: Auto merged storage/heap/hp_extra.c: Auto merged storage/heap/hp_hash.c: Auto merged storage/heap/hp_info.c: Auto merged storage/heap/hp_open.c: Auto merged storage/heap/hp_panic.c: Auto merged storage/heap/hp_rename.c: Auto merged storage/heap/hp_rfirst.c: Auto merged storage/heap/hp_rkey.c: Auto merged storage/heap/hp_rlast.c: Auto merged storage/heap/hp_rnext.c: Auto merged storage/heap/hp_rprev.c: Auto merged storage/heap/hp_rrnd.c: Auto merged storage/heap/hp_rsame.c: Auto merged storage/heap/hp_scan.c: Auto merged storage/heap/hp_static.c: Auto merged storage/heap/hp_test1.c: Auto merged storage/heap/hp_test2.c: Auto merged storage/heap/hp_update.c: Auto merged storage/heap/hp_write.c: Auto merged storage/innobase/Makefile.am: Auto merged storage/innobase/btr/Makefile.am: Auto merged storage/innobase/buf/Makefile.am: Auto merged storage/innobase/data/Makefile.am: Auto merged storage/innobase/dict/Makefile.am: Auto merged storage/innobase/dyn/Makefile.am: Auto merged storage/innobase/eval/Makefile.am: Auto merged storage/innobase/fil/Makefile.am: Auto merged storage/innobase/fsp/Makefile.am: Auto merged storage/innobase/fut/Makefile.am: Auto merged storage/innobase/ha/Makefile.am: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/innobase/handler/ha_innodb.h: Auto merged storage/innobase/ibuf/Makefile.am: Auto merged storage/innobase/lock/Makefile.am: Auto merged storage/innobase/log/Makefile.am: Auto merged storage/innobase/mach/Makefile.am: Auto merged storage/innobase/mem/Makefile.am: Auto merged storage/innobase/mtr/Makefile.am: Auto merged storage/innobase/os/Makefile.am: Auto merged storage/innobase/page/Makefile.am: Auto merged storage/innobase/pars/Makefile.am: Auto merged storage/innobase/que/Makefile.am: Auto merged storage/innobase/read/Makefile.am: Auto merged storage/innobase/rem/Makefile.am: Auto merged storage/innobase/row/Makefile.am: Auto merged storage/innobase/srv/Makefile.am: Auto merged storage/innobase/sync/Makefile.am: Auto merged storage/innobase/thr/Makefile.am: Auto merged storage/innobase/trx/Makefile.am: Auto merged storage/innobase/usr/Makefile.am: Auto merged storage/innobase/ut/Makefile.am: Auto merged storage/myisam/Makefile.am: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ft_eval.c: Auto merged storage/myisam/ft_eval.h: Auto merged storage/myisam/ft_nlq_search.c: Auto merged storage/myisam/ft_parser.c: Auto merged storage/myisam/ft_static.c: Auto merged storage/myisam/ft_stem.c: Auto merged storage/myisam/ft_stopwords.c: Auto merged storage/myisam/ft_test1.c: Auto merged storage/myisam/ft_test1.h: Auto merged storage/myisam/ft_update.c: Auto merged storage/myisam/ftdefs.h: Auto merged storage/myisam/fulltext.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/ha_myisam.h: Auto merged storage/myisam/mi_cache.c: Auto merged storage/myisam/mi_changed.c: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_checksum.c: Auto merged storage/myisam/mi_close.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_dbug.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/mi_delete_all.c: Auto merged storage/myisam/mi_delete_table.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_extra.c: Auto merged storage/myisam/mi_info.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_keycache.c: Auto merged storage/myisam/mi_locking.c: Auto merged storage/myisam/mi_log.c: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisam/mi_packrec.c: Auto merged storage/myisam/mi_page.c: Auto merged storage/myisam/mi_panic.c: Auto merged storage/myisam/mi_preload.c: Auto merged storage/myisam/mi_range.c: Auto merged storage/myisam/mi_rename.c: Auto merged storage/myisam/mi_rfirst.c: Auto merged storage/myisam/mi_rkey.c: Auto merged storage/myisam/mi_rlast.c: Auto merged storage/myisam/mi_rnext.c: Auto merged storage/myisam/mi_rnext_same.c: Auto merged storage/myisam/mi_rprev.c: Auto merged storage/myisam/mi_rrnd.c: Auto merged storage/myisam/mi_rsame.c: Auto merged storage/myisam/mi_rsamepos.c: Auto merged storage/myisam/mi_scan.c: Auto merged storage/myisam/mi_search.c: Auto merged storage/myisam/mi_static.c: Auto merged storage/myisam/mi_statrec.c: Auto merged storage/myisam/mi_test1.c: Auto merged storage/myisam/mi_test2.c: Auto merged storage/myisam/mi_test3.c: Auto merged storage/myisam/mi_unique.c: Auto merged storage/myisam/mi_update.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisam/myisam_ftdump.c: Auto merged storage/myisam/myisamchk.c: Auto merged storage/myisam/myisamdef.h: Auto merged storage/myisam/myisamlog.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/rt_index.c: Auto merged storage/myisam/rt_index.h: Auto merged storage/myisam/rt_key.c: Auto merged storage/myisam/rt_key.h: Auto merged storage/myisam/rt_mbr.c: Auto merged storage/myisam/rt_mbr.h: Auto merged storage/myisam/rt_split.c: Auto merged storage/myisam/rt_test.c: Auto merged storage/myisam/sort.c: Auto merged storage/myisam/sp_defs.h: Auto merged storage/myisam/sp_key.c: Auto merged storage/myisam/sp_test.c: Auto merged storage/myisammrg/Makefile.am: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/myisammrg/ha_myisammrg.h: Auto merged storage/myisammrg/myrg_close.c: Auto merged storage/myisammrg/myrg_create.c: Auto merged storage/myisammrg/myrg_def.h: Auto merged storage/myisammrg/myrg_delete.c: Auto merged storage/myisammrg/myrg_extra.c: Auto merged storage/myisammrg/myrg_info.c: Auto merged storage/myisammrg/myrg_locking.c: Auto merged storage/myisammrg/myrg_open.c: Auto merged storage/myisammrg/myrg_panic.c: Auto merged storage/myisammrg/myrg_queue.c: Auto merged storage/myisammrg/myrg_range.c: Auto merged storage/myisammrg/myrg_rfirst.c: Auto merged storage/myisammrg/myrg_rkey.c: Auto merged storage/myisammrg/myrg_rlast.c: Auto merged storage/myisammrg/myrg_rnext.c: Auto merged storage/myisammrg/myrg_rnext_same.c: Auto merged storage/myisammrg/myrg_rprev.c: Auto merged storage/myisammrg/myrg_rrnd.c: Auto merged storage/myisammrg/myrg_rsame.c: Auto merged storage/myisammrg/myrg_static.c: Auto merged storage/myisammrg/myrg_update.c: Auto merged storage/myisammrg/myrg_write.c: Auto merged storage/ndb/include/debugger/DebuggerNames.hpp: Auto merged storage/ndb/include/debugger/EventLogger.hpp: Auto merged storage/ndb/include/debugger/GrepError.hpp: Auto merged storage/ndb/include/debugger/SignalLoggerManager.hpp: Auto merged storage/ndb/include/ndb_constants.h: Auto merged storage/ndb/include/ndb_global.h.in: Auto merged storage/ndb/include/ndb_init.h: Auto merged storage/ndb/include/ndb_types.h.in: Auto merged storage/ndb/include/ndb_version.h.in: Auto merged storage/ndb/include/editline/editline.h: Auto merged storage/ndb/include/kernel/AttributeDescriptor.hpp: Auto merged storage/ndb/include/kernel/AttributeHeader.hpp: Auto merged storage/ndb/include/kernel/AttributeList.hpp: Auto merged storage/ndb/include/kernel/BlockNumbers.h: Auto merged storage/ndb/include/kernel/GlobalSignalNumbers.h: Auto merged storage/ndb/include/kernel/GrepEvent.hpp: Auto merged storage/ndb/include/kernel/Interpreter.hpp: Auto merged storage/ndb/include/kernel/LogLevel.hpp: Auto merged storage/ndb/include/kernel/NodeBitmask.hpp: Auto merged storage/ndb/include/kernel/NodeInfo.hpp: Auto merged storage/ndb/include/kernel/NodeState.hpp: Auto merged storage/ndb/include/kernel/RefConvert.hpp: Auto merged storage/ndb/include/kernel/kernel_types.h: Auto merged storage/ndb/include/kernel/ndb_limits.h: Auto merged storage/ndb/include/kernel/signaldata/AbortAll.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccScan.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiVersion.hpp: Auto merged storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/AttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/BuildIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp: Auto merged storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CmInit.hpp: Auto merged storage/ndb/include/kernel/trigger_definitions.h: Auto merged storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ConfigParamId.hpp: Auto merged storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyActive.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateEvnt.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/DiAddTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DiGetNodes.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictStart.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictTabInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihAddFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihStartTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp: Auto merged storage/ndb/include/kernel/signaldata/DisconnectRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTabFile.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/EmptyLcp.hpp: Auto merged storage/ndb/include/kernel/signaldata/EndTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/EventReport.hpp: Auto merged storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ExecFragReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FailRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsAppendReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsCloseReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsOpenReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/GCPSave.hpp: Auto merged storage/ndb/include/kernel/signaldata/GetTabInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/GetTableId.hpp: Auto merged storage/ndb/include/kernel/signaldata/GrepImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/HotSpareRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/KeyInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/LCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/ListTables.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhKey.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhTransConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/ManagementServer.hpp: Auto merged storage/ndb/include/kernel/signaldata/MasterGCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/MasterLCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/NdbSttor.hpp: Auto merged storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/NextScan.hpp: Auto merged storage/ndb/include/kernel/signaldata/NodeFailRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/PackedSignal.hpp: Auto merged storage/ndb/include/kernel/signaldata/PrepDropTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/RelTabMem.hpp: Auto merged storage/ndb/include/kernel/signaldata/RepImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/ResumeReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ScanFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/ScanTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/SetVarReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/SrFragidConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartFragReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartMe.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartPerm.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartRec.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopMe.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopPerm.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/SumaImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/SystemError.hpp: Auto merged storage/ndb/include/kernel/signaldata/TamperOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcCommit.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcHbRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TestOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/TransIdAI.hpp: Auto merged storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupCommit.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupKey.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxBound.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxMaint.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/UpdateTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilDelete.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilExecute.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilPrepare.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilRelease.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilSequence.hpp: Auto merged storage/ndb/include/kernel/signaldata/WaitGCP.hpp: Auto merged storage/ndb/include/logger/ConsoleLogHandler.hpp: Auto merged storage/ndb/include/logger/FileLogHandler.hpp: Auto merged storage/ndb/include/logger/LogHandler.hpp: Auto merged storage/ndb/include/logger/Logger.hpp: Auto merged storage/ndb/include/logger/SysLogHandler.hpp: Auto merged storage/ndb/include/mgmapi/mgmapi.h: Auto merged storage/ndb/include/mgmapi/mgmapi_debug.h: Auto merged storage/ndb/include/mgmapi/ndb_logevent.h: Auto merged storage/ndb/include/mgmapi/ndbd_exit_codes.h: Auto merged storage/ndb/include/mgmcommon/ConfigRetriever.hpp: Auto merged storage/ndb/include/mgmcommon/IPCConfig.hpp: Auto merged storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp: Auto merged storage/ndb/include/ndbapi/Ndb.hpp: Auto merged storage/ndb/include/ndbapi/NdbApi.hpp: Auto merged storage/ndb/include/ndbapi/NdbBlob.hpp: Auto merged storage/ndb/include/ndbapi/NdbDictionary.hpp: Auto merged storage/ndb/include/ndbapi/NdbError.hpp: Auto merged storage/ndb/include/ndbapi/NdbEventOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbIndexOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbPool.hpp: Auto merged storage/ndb/include/ndbapi/NdbRecAttr.hpp: Auto merged storage/ndb/include/ndbapi/NdbReceiver.hpp: Auto merged storage/ndb/include/ndbapi/NdbScanFilter.hpp: Auto merged storage/ndb/include/ndbapi/NdbScanOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbTransaction.hpp: Auto merged storage/ndb/include/ndbapi/ndb_cluster_connection.hpp: Auto merged storage/ndb/include/ndbapi/ndb_opt_defaults.h: Auto merged storage/ndb/include/ndbapi/ndbapi_limits.h: Auto merged storage/ndb/include/ndbapi/ndberror.h: Auto merged storage/ndb/include/newtonapi/dba.h: Auto merged storage/ndb/include/newtonapi/defs/pcn_types.h: Auto merged storage/ndb/include/portlib/NdbCondition.h: Auto merged storage/ndb/include/portlib/NdbConfig.h: Auto merged storage/ndb/include/portlib/NdbDaemon.h: Auto merged storage/ndb/include/portlib/NdbEnv.h: Auto merged storage/ndb/include/portlib/NdbHost.h: Auto merged storage/ndb/include/portlib/NdbMain.h: Auto merged storage/ndb/include/portlib/NdbMem.h: Auto merged storage/ndb/include/portlib/NdbMutex.h: Auto merged storage/ndb/include/portlib/NdbSleep.h: Auto merged storage/ndb/include/portlib/NdbTCP.h: Auto merged storage/ndb/include/portlib/NdbThread.h: Auto merged storage/ndb/include/portlib/NdbTick.h: Auto merged storage/ndb/include/portlib/PortDefs.h: Auto merged storage/ndb/include/portlib/prefetch.h: Auto merged storage/ndb/include/transporter/TransporterCallback.hpp: Auto merged storage/ndb/include/transporter/TransporterDefinitions.hpp: Auto merged storage/ndb/include/transporter/TransporterRegistry.hpp: Auto merged storage/ndb/include/util/BaseString.hpp: Auto merged storage/ndb/include/util/Bitmask.hpp: Auto merged storage/ndb/include/util/File.hpp: Auto merged storage/ndb/include/util/InputStream.hpp: Auto merged storage/ndb/include/util/NdbAutoPtr.hpp: Auto merged storage/ndb/include/util/NdbOut.hpp: Auto merged storage/ndb/include/util/NdbSqlUtil.hpp: Auto merged storage/ndb/include/util/OutputStream.hpp: Auto merged storage/ndb/include/util/Parser.hpp: Auto merged storage/ndb/include/util/Properties.hpp: Auto merged storage/ndb/include/util/SimpleProperties.hpp: Auto merged storage/ndb/include/util/SocketAuthenticator.hpp: Auto merged storage/ndb/include/util/SocketClient.hpp: Auto merged storage/ndb/include/util/SocketServer.hpp: Auto merged storage/ndb/include/util/UtilBuffer.hpp: Auto merged storage/ndb/include/util/Vector.hpp: Auto merged storage/ndb/include/util/basestring_vsnprintf.h: Auto merged storage/ndb/include/util/md5_hash.hpp: Auto merged storage/ndb/include/util/ndb_opts.h: Auto merged storage/ndb/include/util/random.h: Auto merged storage/ndb/include/util/socket_io.h: Auto merged storage/ndb/include/util/uucode.h: Auto merged storage/ndb/include/util/version.h: Auto merged storage/ndb/src/common/debugger/BlockNames.cpp: Auto merged storage/ndb/src/common/debugger/DebuggerNames.cpp: Auto merged storage/ndb/src/common/debugger/EventLogger.cpp: Auto merged storage/ndb/src/common/debugger/GrepError.cpp: Auto merged storage/ndb/src/common/debugger/SignalLoggerManager.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AccLock.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTable.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FailRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/GCPSave.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LCP.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhKey.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ScanTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalNames.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/StartRec.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SystemError.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TupCommit.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TupKey.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilLock.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp: Auto merged storage/ndb/src/common/logger/ConsoleLogHandler.cpp: Auto merged storage/ndb/src/common/logger/FileLogHandler.cpp: Auto merged storage/ndb/src/common/logger/LogHandler.cpp: Auto merged storage/ndb/src/common/logger/LogHandlerList.cpp: Auto merged storage/ndb/src/common/logger/LogHandlerList.hpp: Auto merged storage/ndb/src/common/logger/Logger.cpp: Auto merged storage/ndb/src/common/logger/SysLogHandler.cpp: Auto merged storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp: Auto merged storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp: Auto merged storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp: Auto merged storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp: Auto merged storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged storage/ndb/src/common/mgmcommon/IPCConfig.cpp: Auto merged storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp: Auto merged storage/ndb/src/common/portlib/NdbCondition.c: Auto merged storage/ndb/src/common/portlib/NdbConfig.c: Auto merged storage/ndb/src/common/portlib/NdbDaemon.c: Auto merged storage/ndb/src/common/portlib/NdbEnv.c: Auto merged storage/ndb/src/common/portlib/NdbHost.c: Auto merged storage/ndb/src/common/portlib/NdbMem.c: Auto merged storage/ndb/src/common/portlib/NdbMutex.c: Auto merged storage/ndb/src/common/portlib/NdbPortLibTest.cpp: Auto merged storage/ndb/src/common/portlib/NdbSleep.c: Auto merged storage/ndb/src/common/portlib/NdbTCP.cpp: Auto merged storage/ndb/src/common/portlib/NdbThread.c: Auto merged storage/ndb/src/common/portlib/NdbTick.c: Auto merged storage/ndb/src/common/portlib/memtest.c: Auto merged storage/ndb/src/common/portlib/mmstest.cpp: Auto merged storage/ndb/src/common/portlib/munmaptest.cpp: Auto merged storage/ndb/src/common/portlib/win32/NdbCondition.c: Auto merged storage/ndb/src/common/portlib/win32/NdbDaemon.c: Auto merged storage/ndb/src/common/portlib/win32/NdbEnv.c: Auto merged storage/ndb/src/common/portlib/win32/NdbHost.c: Auto merged storage/ndb/src/common/portlib/win32/NdbMem.c: Auto merged storage/ndb/src/common/portlib/win32/NdbMutex.c: Auto merged storage/ndb/src/common/portlib/win32/NdbSleep.c: Auto merged storage/ndb/src/common/portlib/win32/NdbTCP.c: Auto merged storage/ndb/src/common/portlib/win32/NdbThread.c: Auto merged storage/ndb/src/common/portlib/win32/NdbTick.c: Auto merged storage/ndb/src/common/transporter/Packer.cpp: Auto merged storage/ndb/src/common/transporter/Packer.hpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Buffer.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp: Auto merged storage/ndb/src/common/transporter/SendBuffer.cpp: Auto merged storage/ndb/src/common/transporter/SendBuffer.hpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/Transporter.cpp: Auto merged storage/ndb/src/common/transporter/Transporter.hpp: Auto merged storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp: Auto merged storage/ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/buddy.cpp: Auto merged storage/ndb/src/common/transporter/buddy.hpp: Auto merged storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp: Auto merged storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp: Auto merged storage/ndb/src/common/util/BaseString.cpp: Auto merged storage/ndb/src/common/util/File.cpp: Auto merged storage/ndb/src/common/util/InputStream.cpp: Auto merged storage/ndb/src/common/util/NdbOut.cpp: Auto merged storage/ndb/src/common/util/NdbSqlUtil.cpp: Auto merged storage/ndb/src/common/util/OutputStream.cpp: Auto merged storage/ndb/src/common/util/Parser.cpp: Auto merged storage/ndb/src/common/util/Properties.cpp: Auto merged storage/ndb/src/common/util/SimpleProperties.cpp: Auto merged storage/ndb/src/common/util/SocketAuthenticator.cpp: Auto merged storage/ndb/src/common/util/SocketClient.cpp: Auto merged storage/ndb/src/common/util/SocketServer.cpp: Auto merged storage/ndb/src/common/util/basestring_vsnprintf.c: Auto merged storage/ndb/src/common/util/md5_hash.cpp: Auto merged storage/ndb/src/common/util/ndb_init.c: Auto merged storage/ndb/src/common/util/random.c: Auto merged storage/ndb/src/common/util/socket_io.cpp: Auto merged storage/ndb/src/common/util/strdup.c: Auto merged storage/ndb/src/common/util/filetest/FileUnitTest.cpp: Auto merged storage/ndb/src/common/util/filetest/FileUnitTest.hpp: Auto merged storage/ndb/src/common/util/testProperties/testProperties.cpp: Auto merged storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp: Auto merged storage/ndb/src/common/util/uucode.c: Auto merged storage/ndb/src/common/util/version.c: Auto merged storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/TreeView.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/resource.h: Auto merged storage/ndb/src/cw/cpcd/APIService.cpp: Auto merged storage/ndb/src/cw/cpcd/APIService.hpp: Auto merged storage/ndb/src/cw/cpcd/CPCD.cpp: Auto merged storage/ndb/src/cw/cpcd/CPCD.hpp: Auto merged storage/ndb/src/cw/cpcd/Monitor.cpp: Auto merged storage/ndb/src/cw/cpcd/Process.cpp: Auto merged storage/ndb/src/cw/cpcd/common.cpp: Auto merged storage/ndb/src/cw/cpcd/common.hpp: Auto merged storage/ndb/src/cw/cpcd/main.cpp: Auto merged storage/ndb/src/cw/test/socketclient/socketClientTest.cpp: Auto merged storage/ndb/src/cw/util/ClientInterface.cpp: Auto merged storage/ndb/src/cw/util/ClientInterface.hpp: Auto merged storage/ndb/src/cw/util/SocketRegistry.cpp: Auto merged storage/ndb/src/cw/util/SocketRegistry.hpp: Auto merged storage/ndb/src/cw/util/SocketService.cpp: Auto merged storage/ndb/src/cw/util/SocketService.hpp: Auto merged storage/ndb/src/kernel/SimBlockList.cpp: Auto merged storage/ndb/src/kernel/blocks/mutexes.hpp: Auto merged storage/ndb/src/kernel/main.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/BackupInit.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/read.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp: Auto merged storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp: Auto merged storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/timer.hpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.hpp: Auto merged storage/ndb/src/kernel/blocks/suma/SumaInit.cpp: Auto merged storage/ndb/src/kernel/blocks/trix/Trix.cpp: Auto merged storage/ndb/src/kernel/blocks/trix/Trix.hpp: Auto merged storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.cpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.hpp: Auto merged storage/ndb/src/kernel/error/TimeModule.cpp: Auto merged storage/ndb/src/kernel/error/TimeModule.hpp: Auto merged storage/ndb/src/kernel/error/ndbd_exit_codes.c: Auto merged storage/ndb/src/kernel/vm/Array.hpp: Auto merged storage/ndb/src/kernel/vm/ArrayPool.hpp: Auto merged storage/ndb/src/kernel/vm/CArray.hpp: Auto merged storage/ndb/src/kernel/vm/Callback.hpp: Auto merged storage/ndb/src/kernel/vm/ClusterConfiguration.cpp: Auto merged storage/ndb/src/kernel/vm/ClusterConfiguration.hpp: Auto merged storage/ndb/src/kernel/vm/Configuration.cpp: Auto merged storage/ndb/src/kernel/vm/Configuration.hpp: Auto merged storage/ndb/src/kernel/vm/DLFifoList.hpp: Auto merged storage/ndb/src/kernel/vm/DLHashTable.hpp: Auto merged storage/ndb/src/kernel/vm/DLHashTable2.hpp: Auto merged storage/ndb/src/kernel/vm/DLList.hpp: Auto merged storage/ndb/src/kernel/vm/DataBuffer.hpp: Auto merged storage/ndb/src/kernel/vm/Emulator.cpp: Auto merged storage/ndb/src/kernel/vm/Emulator.hpp: Auto merged storage/ndb/src/kernel/vm/FastScheduler.cpp: Auto merged storage/ndb/src/kernel/vm/FastScheduler.hpp: Auto merged storage/ndb/src/kernel/vm/GlobalData.hpp: Auto merged storage/ndb/src/kernel/vm/KeyDescriptor.hpp: Auto merged storage/ndb/src/kernel/vm/KeyTable.hpp: Auto merged storage/ndb/src/kernel/vm/KeyTable2.hpp: Auto merged storage/ndb/src/kernel/vm/LongSignal.hpp: Auto merged storage/ndb/src/kernel/vm/Mutex.cpp: Auto merged storage/ndb/src/kernel/vm/Mutex.hpp: Auto merged storage/ndb/src/kernel/vm/Prio.hpp: Auto merged storage/ndb/src/kernel/vm/RequestTracker.hpp: Auto merged storage/ndb/src/kernel/vm/SLList.hpp: Auto merged storage/ndb/src/kernel/vm/SafeCounter.cpp: Auto merged storage/ndb/src/kernel/vm/SafeCounter.hpp: Auto merged storage/ndb/src/kernel/vm/SectionReader.cpp: Auto merged storage/ndb/src/kernel/vm/SectionReader.hpp: Auto merged storage/ndb/src/kernel/vm/SignalCounter.hpp: Auto merged storage/ndb/src/kernel/vm/SimBlockList.hpp: Auto merged storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.hpp: Auto merged storage/ndb/src/kernel/vm/SuperPool.cpp: Auto merged storage/ndb/src/kernel/vm/SuperPool.hpp: Auto merged storage/ndb/src/kernel/vm/ThreadConfig.cpp: Auto merged storage/ndb/src/kernel/vm/ThreadConfig.hpp: Auto merged storage/ndb/src/kernel/vm/TimeQueue.cpp: Auto merged storage/ndb/src/kernel/vm/TimeQueue.hpp: Auto merged storage/ndb/src/kernel/vm/TransporterCallback.cpp: Auto merged storage/ndb/src/kernel/vm/VMSignal.cpp: Auto merged storage/ndb/src/kernel/vm/VMSignal.hpp: Auto merged storage/ndb/src/kernel/vm/WaitQueue.hpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.cpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.hpp: Auto merged storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp: Auto merged storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp: Auto merged storage/ndb/src/kernel/vm/al_test/main.cpp: Auto merged storage/ndb/src/kernel/vm/ndbd_malloc.cpp: Auto merged storage/ndb/src/kernel/vm/ndbd_malloc.hpp: Auto merged storage/ndb/src/kernel/vm/pc.hpp: Auto merged storage/ndb/src/kernel/vm/testCopy/rr.cpp: Auto merged storage/ndb/src/kernel/vm/testCopy/testCopy.cpp: Auto merged storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp: Auto merged storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp: Auto merged storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp: Auto merged storage/ndb/src/kernel/vm/testSuperPool.cpp: Auto merged storage/ndb/src/mgmapi/LocalConfig.cpp: Auto merged storage/ndb/src/mgmapi/LocalConfig.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi_configuration.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi_internal.h: Auto merged storage/ndb/src/mgmapi/ndb_logevent.cpp: Auto merged storage/ndb/src/mgmapi/ndb_logevent.hpp: Auto merged storage/ndb/src/mgmapi/test/keso.c: Auto merged storage/ndb/src/mgmapi/test/mgmSrvApi.cpp: Auto merged storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged storage/ndb/src/mgmclient/main.cpp: Auto merged storage/ndb/src/mgmclient/ndb_mgmclient.hpp: Auto merged storage/ndb/src/mgmclient/ndb_mgmclient.h: Auto merged storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp: Auto merged storage/ndb/src/mgmsrv/Config.cpp: Auto merged storage/ndb/src/mgmsrv/Config.hpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.hpp: Auto merged storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged storage/ndb/src/mgmsrv/InitConfigFileParser.hpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/mgmsrv/Services.hpp: Auto merged storage/ndb/src/mgmsrv/SignalQueue.cpp: Auto merged storage/ndb/src/mgmsrv/SignalQueue.hpp: Auto merged storage/ndb/src/mgmsrv/convertStrToInt.cpp: Auto merged storage/ndb/src/mgmsrv/convertStrToInt.hpp: Auto merged storage/ndb/src/mgmsrv/main.cpp: Auto merged storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp: Auto merged storage/ndb/src/ndbapi/API.hpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.cpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.hpp: Auto merged storage/ndb/src/ndbapi/DictCache.cpp: Auto merged storage/ndb/src/ndbapi/DictCache.hpp: Auto merged storage/ndb/src/ndbapi/Ndb.cpp: Auto merged storage/ndb/src/ndbapi/NdbApiSignal.cpp: Auto merged storage/ndb/src/ndbapi/NdbApiSignal.hpp: Auto merged storage/ndb/src/ndbapi/NdbBlob.cpp: Auto merged storage/ndb/src/ndbapi/NdbBlobImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbDictionary.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbErrorOut.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbIndexOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbLinHash.hpp: Auto merged storage/ndb/src/ndbapi/NdbOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationExec.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationInt.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationScan.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationSearch.cpp: Auto merged storage/ndb/src/ndbapi/NdbPool.cpp: Auto merged storage/ndb/src/ndbapi/NdbPoolImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbPoolImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged storage/ndb/src/ndbapi/NdbReceiver.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanFilter.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransactionScan.cpp: Auto merged storage/ndb/src/ndbapi/NdbUtil.cpp: Auto merged storage/ndb/src/ndbapi/NdbUtil.hpp: Auto merged storage/ndb/src/ndbapi/NdbWaiter.hpp: Auto merged storage/ndb/src/ndbapi/Ndberr.cpp: Auto merged storage/ndb/src/ndbapi/Ndbif.cpp: Auto merged storage/ndb/src/ndbapi/Ndbinit.cpp: Auto merged storage/ndb/src/ndbapi/Ndblist.cpp: Auto merged storage/ndb/src/ndbapi/ObjectMap.hpp: Auto merged storage/ndb/src/ndbapi/SignalSender.cpp: Auto merged storage/ndb/src/ndbapi/SignalSender.hpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.cpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.hpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp: Auto merged storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp: Auto merged storage/ndb/test/include/CpcClient.hpp: Auto merged storage/ndb/test/include/HugoAsynchTransactions.hpp: Auto merged storage/ndb/test/include/HugoCalculator.hpp: Auto merged storage/ndb/test/include/HugoOperations.hpp: Auto merged storage/ndb/test/include/HugoTransactions.hpp: Auto merged storage/ndb/test/include/NDBT.hpp: Auto merged storage/ndb/test/include/NDBT_DataSet.hpp: Auto merged storage/ndb/test/include/NDBT_DataSetTransaction.hpp: Auto merged storage/ndb/test/include/NDBT_Error.hpp: Auto merged storage/ndb/test/include/NDBT_Output.hpp: Auto merged storage/ndb/test/include/NDBT_ResultRow.hpp: Auto merged storage/ndb/test/include/NDBT_ReturnCodes.h: Auto merged storage/ndb/test/include/NDBT_Stats.hpp: Auto merged storage/ndb/test/include/NDBT_Table.hpp: Auto merged storage/ndb/test/include/NDBT_Tables.hpp: Auto merged storage/ndb/test/include/NDBT_Test.hpp: Auto merged storage/ndb/test/include/NdbBackup.hpp: Auto merged storage/ndb/test/include/NdbConfig.hpp: Auto merged storage/ndb/test/include/NdbGrep.hpp: Auto merged storage/ndb/test/include/NdbRestarter.hpp: Auto merged storage/ndb/test/include/NdbRestarts.hpp: Auto merged storage/ndb/test/include/NdbSchemaCon.hpp: Auto merged storage/ndb/test/include/NdbSchemaOp.hpp: Auto merged storage/ndb/test/include/NdbTest.hpp: Auto merged storage/ndb/test/include/NdbTimer.hpp: Auto merged storage/ndb/test/include/TestNdbEventOperation.hpp: Auto merged storage/ndb/test/include/UtilTransactions.hpp: Auto merged storage/ndb/test/include/getarg.h: Auto merged storage/ndb/test/ndbapi/InsertRecs.cpp: Auto merged storage/ndb/test/ndbapi/ScanFilter.hpp: Auto merged storage/ndb/test/ndbapi/ScanFunctions.hpp: Auto merged storage/ndb/test/ndbapi/ScanInterpretTest.hpp: Auto merged storage/ndb/test/ndbapi/TraceNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/VerifyNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/acid.cpp: Auto merged storage/ndb/test/ndbapi/acid2.cpp: Auto merged storage/ndb/test/ndbapi/adoInsertRecs.cpp: Auto merged storage/ndb/test/ndbapi/asyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/benchronja.cpp: Auto merged storage/ndb/test/ndbapi/bulk_copy.cpp: Auto merged storage/ndb/test/ndbapi/cdrserver.cpp: Auto merged storage/ndb/test/ndbapi/celloDb.cpp: Auto merged storage/ndb/test/ndbapi/create_all_tabs.cpp: Auto merged storage/ndb/test/ndbapi/create_tab.cpp: Auto merged storage/ndb/test/ndbapi/drop_all_tabs.cpp: Auto merged storage/ndb/test/ndbapi/flexAsynch.cpp: Auto merged storage/ndb/test/ndbapi/flexBench.cpp: Auto merged storage/ndb/test/ndbapi/flexHammer.cpp: Auto merged storage/ndb/test/ndbapi/flexScan.cpp: Auto merged storage/ndb/test/ndbapi/flexTT.cpp: Auto merged storage/ndb/test/ndbapi/flexTimedAsynch.cpp: Auto merged storage/ndb/test/ndbapi/flex_bench_mysql.cpp: Auto merged storage/ndb/test/ndbapi/index.cpp: Auto merged storage/ndb/test/ndbapi/index2.cpp: Auto merged storage/ndb/test/ndbapi/initronja.cpp: Auto merged storage/ndb/test/ndbapi/interpreterInTup.cpp: Auto merged storage/ndb/test/ndbapi/mainAsyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/msa.cpp: Auto merged storage/ndb/test/ndbapi/ndb_async1.cpp: Auto merged storage/ndb/test/ndbapi/ndb_async2.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_populate.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction2.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction3.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction4.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction5.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction6.cpp: Auto merged storage/ndb/test/ndbapi/restarter.cpp: Auto merged storage/ndb/test/ndbapi/restarter2.cpp: Auto merged storage/ndb/test/ndbapi/restarts.cpp: Auto merged storage/ndb/test/ndbapi/size.cpp: Auto merged storage/ndb/test/ndbapi/testBackup.cpp: Auto merged storage/ndb/test/ndbapi/testBasic.cpp: Auto merged storage/ndb/test/ndbapi/testBasicAsynch.cpp: Auto merged storage/ndb/test/ndbapi/testBlobs.cpp: Auto merged storage/ndb/test/ndbapi/testDataBuffers.cpp: Auto merged storage/ndb/test/ndbapi/testDeadlock.cpp: Auto merged storage/ndb/test/ndbapi/testDict.cpp: Auto merged storage/ndb/test/ndbapi/testGrepVerify.cpp: Auto merged storage/ndb/test/ndbapi/testIndex.cpp: Auto merged storage/ndb/test/ndbapi/testInterpreter.cpp: Auto merged storage/ndb/test/ndbapi/testMgm.cpp: Auto merged storage/ndb/test/ndbapi/testNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged storage/ndb/test/ndbapi/testOIBasic.cpp: Auto merged storage/ndb/test/ndbapi/testOperations.cpp: Auto merged storage/ndb/test/ndbapi/testOrderedIndex.cpp: Auto merged storage/ndb/test/ndbapi/testPartitioning.cpp: Auto merged storage/ndb/test/ndbapi/testReadPerf.cpp: Auto merged storage/ndb/test/ndbapi/bank/Bank.cpp: Auto merged storage/ndb/test/ndbapi/bank/Bank.hpp: Auto merged storage/ndb/test/ndbapi/bank/BankLoad.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankCreator.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankMakeGL.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankTimer.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp: Auto merged storage/ndb/test/ndbapi/bank/testBank.cpp: Auto merged storage/ndb/test/ndbapi/bench/asyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/bench/dbGenerator.h: Auto merged storage/ndb/test/ndbapi/bench/dbPopulate.cpp: Auto merged storage/ndb/test/ndbapi/bench/dbPopulate.h: Auto merged storage/ndb/test/ndbapi/bench/macros.h: Auto merged storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/bench/mainPopulate.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_async1.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_async2.cpp: Auto merged storage/ndb/test/ndbapi/testRestartGci.cpp: Auto merged storage/ndb/test/ndbapi/testSRBank.cpp: Auto merged storage/ndb/test/ndbapi/testScan.cpp: Auto merged storage/ndb/test/ndbapi/testScanInterpreter.cpp: Auto merged storage/ndb/test/ndbapi/testScanPerf.cpp: Auto merged storage/ndb/test/ndbapi/testSystemRestart.cpp: Auto merged storage/ndb/test/ndbapi/testTimeout.cpp: Auto merged storage/ndb/test/ndbapi/testTransactions.cpp: Auto merged storage/ndb/test/ndbapi/test_event.cpp: Auto merged storage/ndb/test/ndbapi/test_event_merge.cpp: Auto merged storage/ndb/test/ndbapi/test_event_multi_table.cpp: Auto merged storage/ndb/test/ndbapi/userInterface.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_error.hpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_schema.hpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp: Auto merged storage/ndb/test/ndbapi/bench/testData.h: Auto merged storage/ndb/test/ndbapi/bench/testDefinitions.h: Auto merged storage/ndb/test/ndbapi/bench/userInterface.cpp: Auto merged storage/ndb/test/ndbapi/bench/userInterface.h: Auto merged storage/ndb/test/newtonapi/basic_test/basic/basic.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/common.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/common.hpp: Auto merged storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/too_basic.cpp: Auto merged storage/ndb/test/newtonapi/perf_test/perf.cpp: Auto merged storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp: Auto merged storage/ndb/test/odbc/SQL99_test/SQL99_test.h: Auto merged storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp: Auto merged storage/ndb/test/odbc/client/SQLBindColTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLBindParameterTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCancelTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp: Auto merged storage/ndb/test/odbc/client/SQLConnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCopyDescTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDescribeColTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDisconnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLEndTranTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLErrorTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLExecDirectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLExecuteTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFetchTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetInfoTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLParamDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLPrepareTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLPutDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLRowCountTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLTablesTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLTransactTest.cpp: Auto merged storage/ndb/test/odbc/client/common.hpp: Auto merged storage/ndb/test/odbc/client/main.cpp: Auto merged storage/ndb/test/odbc/driver/testOdbcDriver.cpp: Auto merged storage/ndb/test/odbc/test_compiler/test_compiler.cpp: Auto merged storage/ndb/test/run-test/main.cpp: Auto merged storage/ndb/test/run-test/run-test.hpp: Auto merged storage/ndb/test/src/CpcClient.cpp: Auto merged storage/ndb/test/src/HugoAsynchTransactions.cpp: Auto merged storage/ndb/test/src/HugoCalculator.cpp: Auto merged storage/ndb/test/src/HugoOperations.cpp: Auto merged storage/ndb/test/src/HugoTransactions.cpp: Auto merged storage/ndb/test/src/NDBT_Error.cpp: Auto merged storage/ndb/test/src/NDBT_Output.cpp: Auto merged storage/ndb/test/src/NDBT_ResultRow.cpp: Auto merged storage/ndb/test/src/NDBT_ReturnCodes.cpp: Auto merged storage/ndb/test/src/NDBT_Table.cpp: Auto merged storage/ndb/test/src/NDBT_Tables.cpp: Auto merged storage/ndb/test/src/NDBT_Test.cpp: Auto merged storage/ndb/test/src/NdbBackup.cpp: Auto merged storage/ndb/test/src/NdbConfig.cpp: Auto merged storage/ndb/test/src/NdbGrep.cpp: Auto merged storage/ndb/test/src/NdbRestarter.cpp: Auto merged storage/ndb/test/src/NdbRestarts.cpp: Auto merged storage/ndb/test/src/NdbSchemaCon.cpp: Auto merged storage/ndb/test/src/NdbSchemaOp.cpp: Auto merged storage/ndb/test/src/UtilTransactions.cpp: Auto merged storage/ndb/test/tools/copy_tab.cpp: Auto merged storage/ndb/test/tools/cpcc.cpp: Auto merged storage/ndb/test/tools/create_index.cpp: Auto merged storage/ndb/test/tools/hugoCalculator.cpp: Auto merged storage/ndb/test/tools/hugoFill.cpp: Auto merged storage/ndb/test/tools/hugoLoad.cpp: Auto merged storage/ndb/test/tools/hugoLockRecords.cpp: Auto merged storage/ndb/test/tools/hugoPkDelete.cpp: Auto merged storage/ndb/test/tools/hugoPkRead.cpp: Auto merged storage/ndb/test/tools/hugoPkReadRecord.cpp: Auto merged storage/ndb/test/tools/hugoPkUpdate.cpp: Auto merged storage/ndb/test/tools/hugoScanRead.cpp: Auto merged storage/ndb/test/tools/hugoScanUpdate.cpp: Auto merged storage/ndb/test/tools/restart.cpp: Auto merged storage/ndb/test/tools/transproxy.cpp: Auto merged storage/ndb/test/tools/verify_index.cpp: Auto merged storage/ndb/tools/delete_all.cpp: Auto merged storage/ndb/tools/desc.cpp: Auto merged storage/ndb/tools/drop_index.cpp: Auto merged storage/ndb/tools/drop_tab.cpp: Auto merged storage/ndb/tools/listTables.cpp: Auto merged storage/ndb/tools/ndb_condig.cpp: Auto merged storage/ndb/tools/ndb_test_platform.cpp: Auto merged storage/ndb/tools/ndbsql.cpp: Auto merged storage/ndb/tools/restore/Restore.cpp: Auto merged storage/ndb/tools/restore/Restore.hpp: Auto merged storage/ndb/tools/restore/consumer.cpp: Auto merged storage/ndb/tools/restore/consumer.hpp: Auto merged storage/ndb/tools/restore/consumer_printer.cpp: Auto merged storage/ndb/tools/restore/consumer_printer.hpp: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged storage/ndb/tools/restore/consumer_restore.hpp: Auto merged storage/ndb/tools/restore/consumer_restorem.cpp: Auto merged storage/ndb/tools/restore/restore_main.cpp: Auto merged storage/ndb/tools/select_all.cpp: Auto merged storage/ndb/tools/select_count.cpp: Auto merged storage/ndb/tools/waiter.cpp: Auto merged strings/Makefile.am: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-cp932.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-eucjpms.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-mb.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-ujis.c: Auto merged strings/ctype-utf8.c: Auto merged strings/ctype-win1250ch.c: Auto merged strings/ctype.c: Auto merged strings/decimal.c: Auto merged strings/strxnmov.c: Auto merged strings/xml.c: Auto merged tests/Makefile.am: Auto merged tests/mysql_client_test.c: Auto merged vio/Makefile.am: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged vio/viossl.c: Auto merged vio/viosslfactories.c: Auto merged zlib/Makefile.am: Auto merged
1764 lines
53 KiB
C++
1764 lines
53 KiB
C++
/* Copyright (C) 2004 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#define MYSQL_LEX 1
|
|
#include "mysql_priv.h"
|
|
#include "sql_select.h"
|
|
#include "parse_file.h"
|
|
#include "sp.h"
|
|
#include "sp_head.h"
|
|
#include "sp_cache.h"
|
|
|
|
#define MD5_BUFF_LENGTH 33
|
|
|
|
const LEX_STRING view_type= { C_STRING_WITH_LEN("VIEW") };
|
|
|
|
static int mysql_register_view(THD *thd, TABLE_LIST *view,
|
|
enum_view_create_mode mode);
|
|
|
|
const char *updatable_views_with_limit_names[]= { "NO", "YES", NullS };
|
|
TYPELIB updatable_views_with_limit_typelib=
|
|
{
|
|
array_elements(updatable_views_with_limit_names)-1, "",
|
|
updatable_views_with_limit_names,
|
|
0
|
|
};
|
|
|
|
|
|
/*
|
|
Make a unique name for an anonymous view column
|
|
SYNOPSIS
|
|
target reference to the item for which a new name has to be made
|
|
item_list list of items within which we should check uniqueness of
|
|
the created name
|
|
last_element the last element of the list above
|
|
|
|
NOTE
|
|
Unique names are generated by adding 'My_exp_' to the old name of the
|
|
column. In case the name that was created this way already exists, we
|
|
add a numeric postfix to its end (i.e. "1") and increase the number
|
|
until the name becomes unique. If the generated name is longer than
|
|
NAME_LEN, it is truncated.
|
|
*/
|
|
|
|
static void make_unique_view_field_name(Item *target,
|
|
List<Item> &item_list,
|
|
Item *last_element)
|
|
{
|
|
char *name= (target->orig_name ?
|
|
target->orig_name :
|
|
target->name);
|
|
uint name_len, attempt;
|
|
char buff[NAME_LEN+1];
|
|
List_iterator_fast<Item> itc(item_list);
|
|
|
|
for (attempt= 0;; attempt++)
|
|
{
|
|
Item *check;
|
|
bool ok= TRUE;
|
|
|
|
if (attempt)
|
|
name_len= my_snprintf(buff, NAME_LEN, "My_exp_%d_%s", attempt, name);
|
|
else
|
|
name_len= my_snprintf(buff, NAME_LEN, "My_exp_%s", name);
|
|
|
|
do
|
|
{
|
|
check= itc++;
|
|
if (check != target &&
|
|
my_strcasecmp(system_charset_info, buff, check->name) == 0)
|
|
{
|
|
ok= FALSE;
|
|
break;
|
|
}
|
|
} while (check != last_element);
|
|
if (ok)
|
|
break;
|
|
itc.rewind();
|
|
}
|
|
|
|
target->orig_name= target->name;
|
|
target->set_name(buff, name_len, system_charset_info);
|
|
}
|
|
|
|
|
|
/*
|
|
Check if items with same names are present in list and possibly
|
|
generate unique names for them.
|
|
|
|
SYNOPSIS
|
|
item_list list of Items which should be checked for duplicates
|
|
gen_unique_view_name flag: generate unique name or return with error when
|
|
duplicate names are found.
|
|
|
|
DESCRIPTION
|
|
This function is used on view creation and preparation of derived tables.
|
|
It checks item_list for items with duplicate names. If it founds two
|
|
items with same name and conversion to unique names isn't allowed, or
|
|
names for both items are set by user - function fails.
|
|
Otherwise it generates unique name for one item with autogenerated name
|
|
using make_unique_view_field_name()
|
|
|
|
RETURN VALUE
|
|
FALSE no duplicate names found, or they are converted to unique ones
|
|
TRUE duplicate names are found and they can't be converted or conversion
|
|
isn't allowed
|
|
*/
|
|
|
|
bool check_duplicate_names(List<Item> &item_list, bool gen_unique_view_name)
|
|
{
|
|
Item *item;
|
|
List_iterator_fast<Item> it(item_list);
|
|
List_iterator_fast<Item> itc(item_list);
|
|
DBUG_ENTER("check_duplicate_names");
|
|
|
|
while ((item= it++))
|
|
{
|
|
Item *check;
|
|
/* treat underlying fields like set by user names */
|
|
if (item->real_item()->type() == Item::FIELD_ITEM)
|
|
item->is_autogenerated_name= FALSE;
|
|
itc.rewind();
|
|
while ((check= itc++) && check != item)
|
|
{
|
|
if (my_strcasecmp(system_charset_info, item->name, check->name) == 0)
|
|
{
|
|
if (!gen_unique_view_name)
|
|
goto err;
|
|
if (item->is_autogenerated_name)
|
|
make_unique_view_field_name(item, item_list, item);
|
|
else if (check->is_autogenerated_name)
|
|
make_unique_view_field_name(check, item_list, item);
|
|
else
|
|
goto err;
|
|
}
|
|
}
|
|
}
|
|
DBUG_RETURN(FALSE);
|
|
|
|
err:
|
|
my_error(ER_DUP_FIELDNAME, MYF(0), item->name);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
/*
|
|
Fill defined view parts
|
|
|
|
SYNOPSIS
|
|
fill_defined_view_parts()
|
|
thd current thread.
|
|
view view to operate on
|
|
|
|
DESCRIPTION
|
|
This function will initialize the parts of the view
|
|
definition that are not specified in ALTER VIEW
|
|
to their values from CREATE VIEW.
|
|
The view must be opened to get its definition.
|
|
We use a copy of the view when opening because we want
|
|
to preserve the original view instance.
|
|
|
|
RETURN VALUE
|
|
TRUE can't open table
|
|
FALSE success
|
|
*/
|
|
static bool
|
|
fill_defined_view_parts (THD *thd, TABLE_LIST *view)
|
|
{
|
|
LEX *lex= thd->lex;
|
|
bool not_used;
|
|
TABLE_LIST decoy;
|
|
|
|
memcpy (&decoy, view, sizeof (TABLE_LIST));
|
|
if (!open_table(thd, &decoy, thd->mem_root, ¬_used, OPEN_VIEW_NO_PARSE) &&
|
|
!decoy.view)
|
|
{
|
|
/* It's a table */
|
|
return TRUE;
|
|
}
|
|
|
|
if (!lex->definer)
|
|
{
|
|
view->definer.host= decoy.definer.host;
|
|
view->definer.user= decoy.definer.user;
|
|
lex->definer= &view->definer;
|
|
}
|
|
if (lex->create_view_algorithm == VIEW_ALGORITHM_UNDEFINED)
|
|
lex->create_view_algorithm= (uint8) decoy.algorithm;
|
|
if (lex->create_view_suid == VIEW_SUID_DEFAULT)
|
|
lex->create_view_suid= decoy.view_suid ?
|
|
VIEW_SUID_DEFINER : VIEW_SUID_INVOKER;
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*
|
|
Creating/altering VIEW procedure
|
|
|
|
SYNOPSIS
|
|
mysql_create_view()
|
|
thd - thread handler
|
|
views - views to create
|
|
mode - VIEW_CREATE_NEW, VIEW_ALTER, VIEW_CREATE_OR_REPLACE
|
|
|
|
RETURN VALUE
|
|
FALSE OK
|
|
TRUE Error
|
|
*/
|
|
|
|
bool mysql_create_view(THD *thd, TABLE_LIST *views,
|
|
enum_view_create_mode mode)
|
|
{
|
|
LEX *lex= thd->lex;
|
|
bool link_to_local;
|
|
/* first table in list is target VIEW name => cut off it */
|
|
TABLE_LIST *view= lex->unlink_first_table(&link_to_local);
|
|
TABLE_LIST *tables= lex->query_tables;
|
|
TABLE_LIST *tbl;
|
|
SELECT_LEX *select_lex= &lex->select_lex;
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
SELECT_LEX *sl;
|
|
#endif
|
|
SELECT_LEX_UNIT *unit= &lex->unit;
|
|
bool res= FALSE;
|
|
DBUG_ENTER("mysql_create_view");
|
|
|
|
/* This is ensured in the parser. */
|
|
DBUG_ASSERT(!lex->proc_list.first && !lex->result &&
|
|
!lex->param_list.elements && !lex->derived_tables);
|
|
|
|
if (mode != VIEW_CREATE_NEW)
|
|
{
|
|
if (mode == VIEW_ALTER &&
|
|
fill_defined_view_parts(thd, view))
|
|
{
|
|
res= TRUE;
|
|
goto err;
|
|
}
|
|
sp_cache_invalidate();
|
|
}
|
|
|
|
if (!lex->definer)
|
|
{
|
|
/*
|
|
DEFINER-clause is missing; we have to create default definer in
|
|
persistent arena to be PS/SP friendly.
|
|
*/
|
|
|
|
Query_arena original_arena;
|
|
Query_arena *ps_arena = thd->activate_stmt_arena_if_needed(&original_arena);
|
|
|
|
if (!(lex->definer= create_default_definer(thd)))
|
|
res= TRUE;
|
|
|
|
if (ps_arena)
|
|
thd->restore_active_arena(ps_arena, &original_arena);
|
|
|
|
if (res)
|
|
goto err;
|
|
}
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
/*
|
|
check definer of view:
|
|
- same as current user
|
|
- current user has SUPER_ACL
|
|
*/
|
|
if (strcmp(lex->definer->user.str,
|
|
thd->security_ctx->priv_user) != 0 ||
|
|
my_strcasecmp(system_charset_info,
|
|
lex->definer->host.str,
|
|
thd->security_ctx->priv_host) != 0)
|
|
{
|
|
if (!(thd->security_ctx->master_access & SUPER_ACL))
|
|
{
|
|
my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER");
|
|
res= TRUE;
|
|
goto err;
|
|
}
|
|
else
|
|
{
|
|
if (!is_acl_user(lex->definer->host.str,
|
|
lex->definer->user.str))
|
|
{
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
ER_NO_SUCH_USER,
|
|
ER(ER_NO_SUCH_USER),
|
|
lex->definer->user.str,
|
|
lex->definer->host.str);
|
|
}
|
|
}
|
|
}
|
|
/*
|
|
Privilege check for view creation:
|
|
- user has CREATE VIEW privilege on view table
|
|
- user has DROP privilege in case of ALTER VIEW or CREATE OR REPLACE
|
|
VIEW
|
|
- user has some (SELECT/UPDATE/INSERT/DELETE) privileges on columns of
|
|
underlying tables used on top of SELECT list (because it can be
|
|
(theoretically) updated, so it is enough to have UPDATE privilege on
|
|
them, for example)
|
|
- user has SELECT privilege on columns used in expressions of VIEW select
|
|
- for columns of underly tables used on top of SELECT list also will be
|
|
checked that we have not more privileges on correspondent column of view
|
|
table (i.e. user will not get some privileges by view creation)
|
|
*/
|
|
if ((check_access(thd, CREATE_VIEW_ACL, view->db, &view->grant.privilege,
|
|
0, 0, is_schema_db(view->db)) ||
|
|
grant_option && check_grant(thd, CREATE_VIEW_ACL, view, 0, 1, 0)) ||
|
|
(mode != VIEW_CREATE_NEW &&
|
|
(check_access(thd, DROP_ACL, view->db, &view->grant.privilege,
|
|
0, 0, is_schema_db(view->db)) ||
|
|
grant_option && check_grant(thd, DROP_ACL, view, 0, 1, 0))))
|
|
{
|
|
res= TRUE;
|
|
goto err;
|
|
}
|
|
for (sl= select_lex; sl; sl= sl->next_select())
|
|
{
|
|
for (tbl= sl->get_table_list(); tbl; tbl= tbl->next_local)
|
|
{
|
|
/*
|
|
Ensure that we have some privileges on this table, more strict check
|
|
will be done on column level after preparation,
|
|
*/
|
|
if (check_some_access(thd, VIEW_ANY_ACL, tbl))
|
|
{
|
|
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
|
|
"ANY", thd->security_ctx->priv_user,
|
|
thd->security_ctx->priv_host, tbl->table_name);
|
|
res= TRUE;
|
|
goto err;
|
|
}
|
|
/*
|
|
Mark this table as a table which will be checked after the prepare
|
|
phase
|
|
*/
|
|
tbl->table_in_first_from_clause= 1;
|
|
|
|
/*
|
|
We need to check only SELECT_ACL for all normal fields, fields for
|
|
which we need "any" (SELECT/UPDATE/INSERT/DELETE) privilege will be
|
|
checked later
|
|
*/
|
|
tbl->grant.want_privilege= SELECT_ACL;
|
|
/*
|
|
Make sure that all rights are loaded to the TABLE::grant field.
|
|
|
|
tbl->table_name will be correct name of table because VIEWs are
|
|
not opened yet.
|
|
*/
|
|
fill_effective_table_privileges(thd, &tbl->grant, tbl->db,
|
|
tbl->table_name);
|
|
}
|
|
}
|
|
|
|
if (&lex->select_lex != lex->all_selects_list)
|
|
{
|
|
/* check tables of subqueries */
|
|
for (tbl= tables; tbl; tbl= tbl->next_global)
|
|
{
|
|
if (!tbl->table_in_first_from_clause)
|
|
{
|
|
if (check_access(thd, SELECT_ACL, tbl->db,
|
|
&tbl->grant.privilege, 0, 0, test(tbl->schema_table)) ||
|
|
grant_option && check_grant(thd, SELECT_ACL, tbl, 0, 1, 0))
|
|
{
|
|
res= TRUE;
|
|
goto err;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
/*
|
|
Mark fields for special privilege check ("any" privilege)
|
|
*/
|
|
for (sl= select_lex; sl; sl= sl->next_select())
|
|
{
|
|
List_iterator_fast<Item> it(sl->item_list);
|
|
Item *item;
|
|
while ((item= it++))
|
|
{
|
|
Item_field *field;
|
|
if ((field= item->filed_for_view_update()))
|
|
field->any_privileges= 1;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
if (open_and_lock_tables(thd, tables))
|
|
{
|
|
res= TRUE;
|
|
goto err;
|
|
}
|
|
|
|
/*
|
|
check that tables are not temporary and this VIEW do not used in query
|
|
(it is possible with ALTERing VIEW).
|
|
open_and_lock_tables can change the value of tables,
|
|
e.g. it may happen if before the function call tables was equal to 0.
|
|
*/
|
|
for (tbl= lex->query_tables; tbl; tbl= tbl->next_global)
|
|
{
|
|
/* is this table view and the same view which we creates now? */
|
|
if (tbl->view &&
|
|
strcmp(tbl->view_db.str, view->db) == 0 &&
|
|
strcmp(tbl->view_name.str, view->table_name) == 0)
|
|
{
|
|
my_error(ER_NO_SUCH_TABLE, MYF(0), tbl->view_db.str, tbl->view_name.str);
|
|
res= TRUE;
|
|
goto err;
|
|
}
|
|
|
|
/*
|
|
tbl->table can be NULL when tbl is a placeholder for a view
|
|
that is indirectly referenced via a stored function from the
|
|
view being created. We don't check these indirectly
|
|
referenced views in CREATE VIEW so they don't have table
|
|
object.
|
|
*/
|
|
if (tbl->table)
|
|
{
|
|
/* is this table temporary and is not view? */
|
|
if (tbl->table->s->tmp_table != NO_TMP_TABLE && !tbl->view &&
|
|
!tbl->schema_table)
|
|
{
|
|
my_error(ER_VIEW_SELECT_TMPTABLE, MYF(0), tbl->alias);
|
|
res= TRUE;
|
|
goto err;
|
|
}
|
|
/*
|
|
Copy the privileges of the underlying VIEWs which were filled by
|
|
fill_effective_table_privileges
|
|
(they were not copied at derived tables processing)
|
|
*/
|
|
tbl->table->grant.privilege= tbl->grant.privilege;
|
|
}
|
|
}
|
|
|
|
/* prepare select to resolve all fields */
|
|
lex->view_prepare_mode= 1;
|
|
if (unit->prepare(thd, 0, 0))
|
|
{
|
|
/*
|
|
some errors from prepare are reported to user, if is not then
|
|
it will be checked after err: label
|
|
*/
|
|
res= TRUE;
|
|
goto err;
|
|
}
|
|
|
|
/* view list (list of view fields names) */
|
|
if (lex->view_list.elements)
|
|
{
|
|
List_iterator_fast<Item> it(select_lex->item_list);
|
|
List_iterator_fast<LEX_STRING> nm(lex->view_list);
|
|
Item *item;
|
|
LEX_STRING *name;
|
|
|
|
if (lex->view_list.elements != select_lex->item_list.elements)
|
|
{
|
|
my_message(ER_VIEW_WRONG_LIST, ER(ER_VIEW_WRONG_LIST), MYF(0));
|
|
res= TRUE;
|
|
goto err;
|
|
}
|
|
while ((item= it++, name= nm++))
|
|
{
|
|
item->set_name(name->str, name->length, system_charset_info);
|
|
item->is_autogenerated_name= FALSE;
|
|
}
|
|
}
|
|
|
|
if (check_duplicate_names(select_lex->item_list, 1))
|
|
{
|
|
res= TRUE;
|
|
goto err;
|
|
}
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
/*
|
|
Compare/check grants on view with grants of underlying tables
|
|
*/
|
|
for (sl= select_lex; sl; sl= sl->next_select())
|
|
{
|
|
DBUG_ASSERT(view->db); /* Must be set in the parser */
|
|
List_iterator_fast<Item> it(sl->item_list);
|
|
Item *item;
|
|
fill_effective_table_privileges(thd, &view->grant, view->db,
|
|
view->table_name);
|
|
while ((item= it++))
|
|
{
|
|
Item_field *fld;
|
|
uint priv= (get_column_grant(thd, &view->grant, view->db,
|
|
view->table_name, item->name) &
|
|
VIEW_ANY_ACL);
|
|
if ((fld= item->filed_for_view_update()))
|
|
{
|
|
/*
|
|
Do we have more privileges on view field then underlying table field?
|
|
*/
|
|
if (!fld->field->table->s->tmp_table && (~fld->have_privileges & priv))
|
|
{
|
|
/* VIEW column has more privileges */
|
|
my_error(ER_COLUMNACCESS_DENIED_ERROR, MYF(0),
|
|
"create view", thd->security_ctx->priv_user,
|
|
thd->security_ctx->priv_host, item->name,
|
|
view->table_name);
|
|
res= TRUE;
|
|
goto err;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
|
|
if (wait_if_global_read_lock(thd, 0, 0))
|
|
{
|
|
res= TRUE;
|
|
goto err;
|
|
}
|
|
VOID(pthread_mutex_lock(&LOCK_open));
|
|
res= mysql_register_view(thd, view, mode);
|
|
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
String buff;
|
|
const LEX_STRING command[3]=
|
|
{{ C_STRING_WITH_LEN("CREATE ") },
|
|
{ C_STRING_WITH_LEN("ALTER ") },
|
|
{ C_STRING_WITH_LEN("CREATE OR REPLACE ") }};
|
|
|
|
buff.append(command[thd->lex->create_view_mode].str,
|
|
command[thd->lex->create_view_mode].length);
|
|
view_store_options(thd, views, &buff);
|
|
buff.append(STRING_WITH_LEN("VIEW "));
|
|
/* Test if user supplied a db (ie: we did not use thd->db) */
|
|
if (views->db && views->db[0] &&
|
|
(thd->db == NULL || strcmp(views->db, thd->db)))
|
|
{
|
|
append_identifier(thd, &buff, views->db,
|
|
views->db_length);
|
|
buff.append('.');
|
|
}
|
|
append_identifier(thd, &buff, views->table_name,
|
|
views->table_name_length);
|
|
if (lex->view_list.elements)
|
|
{
|
|
List_iterator_fast<LEX_STRING> names(lex->view_list);
|
|
LEX_STRING *name;
|
|
int i;
|
|
|
|
for (i= 0; (name= names++); i++)
|
|
{
|
|
buff.append(i ? ", " : "(");
|
|
append_identifier(thd, &buff, name->str, name->length);
|
|
}
|
|
buff.append(')');
|
|
}
|
|
buff.append(STRING_WITH_LEN(" AS "));
|
|
buff.append(views->source.str, views->source.length);
|
|
|
|
thd->binlog_query(THD::STMT_QUERY_TYPE,
|
|
buff.ptr(), buff.length(), FALSE, FALSE);
|
|
}
|
|
|
|
VOID(pthread_mutex_unlock(&LOCK_open));
|
|
if (view->revision != 1)
|
|
query_cache_invalidate3(thd, view, 0);
|
|
start_waiting_global_read_lock(thd);
|
|
if (res)
|
|
goto err;
|
|
|
|
send_ok(thd);
|
|
lex->link_first_table_back(view, link_to_local);
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
thd->proc_info= "end";
|
|
lex->link_first_table_back(view, link_to_local);
|
|
unit->cleanup();
|
|
DBUG_RETURN(res || thd->net.report_error);
|
|
}
|
|
|
|
|
|
/* index of revision number in following table */
|
|
static const int revision_number_position= 8;
|
|
/* index of last required parameter for making view */
|
|
static const int required_view_parameters= 10;
|
|
/* number of backups */
|
|
static const int num_view_backups= 3;
|
|
|
|
/*
|
|
table of VIEW .frm field descriptors
|
|
|
|
Note that one should NOT change the order for this, as it's used by
|
|
parse()
|
|
*/
|
|
static File_option view_parameters[]=
|
|
{{{ C_STRING_WITH_LEN("query")},
|
|
my_offsetof(TABLE_LIST, query),
|
|
FILE_OPTIONS_ESTRING},
|
|
{{ C_STRING_WITH_LEN("md5")},
|
|
my_offsetof(TABLE_LIST, md5),
|
|
FILE_OPTIONS_STRING},
|
|
{{ C_STRING_WITH_LEN("updatable")},
|
|
my_offsetof(TABLE_LIST, updatable_view),
|
|
FILE_OPTIONS_ULONGLONG},
|
|
{{ C_STRING_WITH_LEN("algorithm")},
|
|
my_offsetof(TABLE_LIST, algorithm),
|
|
FILE_OPTIONS_ULONGLONG},
|
|
{{ C_STRING_WITH_LEN("definer_user")},
|
|
my_offsetof(TABLE_LIST, definer.user),
|
|
FILE_OPTIONS_STRING},
|
|
{{ C_STRING_WITH_LEN("definer_host")},
|
|
my_offsetof(TABLE_LIST, definer.host),
|
|
FILE_OPTIONS_STRING},
|
|
{{ C_STRING_WITH_LEN("suid")},
|
|
my_offsetof(TABLE_LIST, view_suid),
|
|
FILE_OPTIONS_ULONGLONG},
|
|
{{ C_STRING_WITH_LEN("with_check_option")},
|
|
my_offsetof(TABLE_LIST, with_check),
|
|
FILE_OPTIONS_ULONGLONG},
|
|
{{ C_STRING_WITH_LEN("revision")},
|
|
my_offsetof(TABLE_LIST, revision),
|
|
FILE_OPTIONS_REV},
|
|
{{ C_STRING_WITH_LEN("timestamp")},
|
|
my_offsetof(TABLE_LIST, timestamp),
|
|
FILE_OPTIONS_TIMESTAMP},
|
|
{{ C_STRING_WITH_LEN("create-version")},
|
|
my_offsetof(TABLE_LIST, file_version),
|
|
FILE_OPTIONS_ULONGLONG},
|
|
{{ C_STRING_WITH_LEN("source")},
|
|
my_offsetof(TABLE_LIST, source),
|
|
FILE_OPTIONS_ESTRING},
|
|
{{NullS, 0}, 0,
|
|
FILE_OPTIONS_STRING}
|
|
};
|
|
|
|
static LEX_STRING view_file_type[]= {{(char*) STRING_WITH_LEN("VIEW") }};
|
|
|
|
|
|
/*
|
|
Register VIEW (write .frm & process .frm's history backups)
|
|
|
|
SYNOPSIS
|
|
mysql_register_view()
|
|
thd - thread handler
|
|
view - view description
|
|
mode - VIEW_CREATE_NEW, VIEW_ALTER, VIEW_CREATE_OR_REPLACE
|
|
|
|
RETURN
|
|
0 OK
|
|
-1 Error
|
|
1 Error and error message given
|
|
*/
|
|
|
|
static int mysql_register_view(THD *thd, TABLE_LIST *view,
|
|
enum_view_create_mode mode)
|
|
{
|
|
LEX *lex= thd->lex;
|
|
char buff[4096];
|
|
String str(buff,(uint32) sizeof(buff), system_charset_info);
|
|
char md5[MD5_BUFF_LENGTH];
|
|
bool can_be_merged;
|
|
char dir_buff[FN_REFLEN], path_buff[FN_REFLEN];
|
|
const uchar *endp;
|
|
LEX_STRING dir, file, path;
|
|
DBUG_ENTER("mysql_register_view");
|
|
|
|
/* print query */
|
|
str.length(0);
|
|
{
|
|
ulong sql_mode= thd->variables.sql_mode & MODE_ANSI_QUOTES;
|
|
thd->variables.sql_mode&= ~MODE_ANSI_QUOTES;
|
|
lex->unit.print(&str);
|
|
thd->variables.sql_mode|= sql_mode;
|
|
}
|
|
str.append('\0');
|
|
DBUG_PRINT("info", ("View: %s", str.ptr()));
|
|
|
|
/* print file name */
|
|
dir.length= build_table_filename(dir_buff, sizeof(dir_buff),
|
|
view->db, "", "", 0);
|
|
dir.str= dir_buff;
|
|
|
|
path.length= build_table_filename(path_buff, sizeof(path_buff),
|
|
view->db, view->table_name, reg_ext, 0);
|
|
path.str= path_buff;
|
|
|
|
file.str= path.str + dir.length;
|
|
file.length= path.length - dir.length;
|
|
|
|
/* init timestamp */
|
|
if (!view->timestamp.str)
|
|
view->timestamp.str= view->timestamp_buffer;
|
|
|
|
/* check old .frm */
|
|
{
|
|
char path_buff[FN_REFLEN];
|
|
LEX_STRING path;
|
|
File_parser *parser;
|
|
|
|
path.str= path_buff;
|
|
fn_format(path_buff, file.str, dir.str, 0, MY_UNPACK_FILENAME);
|
|
path.length= strlen(path_buff);
|
|
|
|
if (!access(path.str, F_OK))
|
|
{
|
|
if (mode == VIEW_CREATE_NEW)
|
|
{
|
|
my_error(ER_TABLE_EXISTS_ERROR, MYF(0), view->alias);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
|
|
if (!(parser= sql_parse_prepare(&path, thd->mem_root, 0)))
|
|
DBUG_RETURN(1);
|
|
|
|
if (!parser->ok() || !is_equal(&view_type, parser->type()))
|
|
{
|
|
my_error(ER_WRONG_OBJECT, MYF(0), view->db, view->table_name, "VIEW");
|
|
DBUG_RETURN(-1);
|
|
}
|
|
|
|
/*
|
|
read revision number
|
|
|
|
TODO: read dependence list, too, to process cascade/restrict
|
|
TODO: special cascade/restrict procedure for alter?
|
|
*/
|
|
if (parser->parse((gptr)view, thd->mem_root,
|
|
view_parameters + revision_number_position, 1,
|
|
&file_parser_dummy_hook))
|
|
{
|
|
DBUG_RETURN(thd->net.report_error? -1 : 0);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (mode == VIEW_ALTER)
|
|
{
|
|
my_error(ER_NO_SUCH_TABLE, MYF(0), view->db, view->alias);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
}
|
|
}
|
|
/* fill structure */
|
|
view->query.str= (char*)str.ptr();
|
|
view->query.length= str.length()-1; // we do not need last \0
|
|
view->source.str= thd->query + thd->lex->create_view_select_start;
|
|
endp= (uchar*) view->source.str;
|
|
endp= skip_rear_comments(endp, (uchar*) (thd->query + thd->query_length));
|
|
view->source.length= endp - (uchar*) view->source.str;
|
|
view->file_version= 1;
|
|
view->calc_md5(md5);
|
|
view->md5.str= md5;
|
|
view->md5.length= 32;
|
|
can_be_merged= lex->can_be_merged();
|
|
if (lex->create_view_algorithm == VIEW_ALGORITHM_MERGE &&
|
|
!lex->can_be_merged())
|
|
{
|
|
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_VIEW_MERGE,
|
|
ER(ER_WARN_VIEW_MERGE));
|
|
lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED;
|
|
}
|
|
view->algorithm= lex->create_view_algorithm;
|
|
view->definer.user= lex->definer->user;
|
|
view->definer.host= lex->definer->host;
|
|
view->view_suid= lex->create_view_suid;
|
|
view->with_check= lex->create_view_check;
|
|
if ((view->updatable_view= (can_be_merged &&
|
|
view->algorithm != VIEW_ALGORITHM_TMPTABLE)))
|
|
{
|
|
/* TODO: change here when we will support UNIONs */
|
|
for (TABLE_LIST *tbl= (TABLE_LIST *)lex->select_lex.table_list.first;
|
|
tbl;
|
|
tbl= tbl->next_local)
|
|
{
|
|
if ((tbl->view && !tbl->updatable_view) || tbl->schema_table)
|
|
{
|
|
view->updatable_view= 0;
|
|
break;
|
|
}
|
|
for (TABLE_LIST *up= tbl; up; up= up->embedding)
|
|
{
|
|
if (up->outer_join)
|
|
{
|
|
view->updatable_view= 0;
|
|
goto loop_out;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
loop_out:
|
|
/*
|
|
Check that table of main select do not used in subqueries.
|
|
|
|
This test can catch only very simple cases of such non-updateable views,
|
|
all other will be detected before updating commands execution.
|
|
(it is more optimisation then real check)
|
|
|
|
NOTE: this skip cases of using table via VIEWs, joined VIEWs, VIEWs with
|
|
UNION
|
|
*/
|
|
if (view->updatable_view &&
|
|
!lex->select_lex.next_select() &&
|
|
!((TABLE_LIST*)lex->select_lex.table_list.first)->next_local &&
|
|
find_table_in_global_list(lex->query_tables->next_global,
|
|
lex->query_tables->db,
|
|
lex->query_tables->table_name))
|
|
{
|
|
view->updatable_view= 0;
|
|
}
|
|
|
|
if (view->with_check != VIEW_CHECK_NONE &&
|
|
!view->updatable_view)
|
|
{
|
|
my_error(ER_VIEW_NONUPD_CHECK, MYF(0), view->db, view->table_name);
|
|
DBUG_RETURN(-1);
|
|
}
|
|
|
|
if (sql_create_definition_file(&dir, &file, view_file_type,
|
|
(gptr)view, view_parameters, num_view_backups))
|
|
{
|
|
DBUG_RETURN(thd->net.report_error? -1 : 1);
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
read VIEW .frm and create structures
|
|
|
|
SYNOPSIS
|
|
mysql_make_view()
|
|
thd Thread handler
|
|
parser parser object
|
|
table TABLE_LIST structure for filling
|
|
flags flags
|
|
RETURN
|
|
0 ok
|
|
1 error
|
|
*/
|
|
|
|
bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table,
|
|
uint flags)
|
|
{
|
|
SELECT_LEX *end, *view_select;
|
|
LEX *old_lex, *lex;
|
|
Query_arena *arena, backup;
|
|
TABLE_LIST *top_view= table->top_table();
|
|
int res;
|
|
bool result;
|
|
DBUG_ENTER("mysql_make_view");
|
|
DBUG_PRINT("info", ("table: 0x%lx (%s)", (ulong) table, table->table_name));
|
|
|
|
if (table->view)
|
|
{
|
|
/*
|
|
It's an execution of a PS/SP and the view has already been unfolded
|
|
into a list of used tables. Now we only need to update the information
|
|
about granted privileges in the view tables with the actual data
|
|
stored in MySQL privilege system. We don't need to restore the
|
|
required privileges (by calling register_want_access) because they has
|
|
not changed since PREPARE or the previous execution: the only case
|
|
when this information is changed is execution of UPDATE on a view, but
|
|
the original want_access is restored in its end.
|
|
*/
|
|
if (!table->prelocking_placeholder && table->prepare_security(thd))
|
|
{
|
|
DBUG_RETURN(1);
|
|
}
|
|
DBUG_PRINT("info",
|
|
("VIEW %s.%s is already processed on previous PS/SP execution",
|
|
table->view_db.str, table->view_name.str));
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
/* check loop via view definition */
|
|
for (TABLE_LIST *precedent= table->referencing_view;
|
|
precedent;
|
|
precedent= precedent->referencing_view)
|
|
{
|
|
if (precedent->view_name.length == table->table_name_length &&
|
|
precedent->view_db.length == table->db_length &&
|
|
my_strcasecmp(system_charset_info,
|
|
precedent->view_name.str, table->table_name) == 0 &&
|
|
my_strcasecmp(system_charset_info,
|
|
precedent->view_db.str, table->db) == 0)
|
|
{
|
|
my_error(ER_VIEW_RECURSIVE, MYF(0),
|
|
top_view->view_db.str, top_view->view_name.str);
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
}
|
|
|
|
/*
|
|
For now we assume that tables will not be changed during PS life (it
|
|
will be TRUE as far as we make new table cache).
|
|
*/
|
|
old_lex= thd->lex;
|
|
arena= thd->stmt_arena;
|
|
if (arena->is_conventional())
|
|
arena= 0;
|
|
else
|
|
thd->set_n_backup_active_arena(arena, &backup);
|
|
|
|
/* init timestamp */
|
|
if (!table->timestamp.str)
|
|
table->timestamp.str= table->timestamp_buffer;
|
|
/* prepare default values for old format */
|
|
table->view_suid= TRUE;
|
|
table->definer.user.str= table->definer.host.str= 0;
|
|
table->definer.user.length= table->definer.host.length= 0;
|
|
|
|
/*
|
|
TODO: when VIEWs will be stored in cache, table mem_root should
|
|
be used here
|
|
*/
|
|
if (parser->parse((gptr)table, thd->mem_root, view_parameters,
|
|
required_view_parameters, &file_parser_dummy_hook))
|
|
goto err;
|
|
|
|
/*
|
|
check old format view .frm
|
|
*/
|
|
if (!table->definer.user.str)
|
|
{
|
|
DBUG_ASSERT(!table->definer.host.str &&
|
|
!table->definer.user.length &&
|
|
!table->definer.host.length);
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
|
|
ER_VIEW_FRM_NO_USER, ER(ER_VIEW_FRM_NO_USER),
|
|
table->db, table->table_name);
|
|
get_default_definer(thd, &table->definer);
|
|
}
|
|
if (flags & OPEN_VIEW_NO_PARSE)
|
|
{
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
/*
|
|
Save VIEW parameters, which will be wiped out by derived table
|
|
processing
|
|
*/
|
|
table->view_db.str= table->db;
|
|
table->view_db.length= table->db_length;
|
|
table->view_name.str= table->table_name;
|
|
table->view_name.length= table->table_name_length;
|
|
|
|
/*TODO: md5 test here and warning if it is differ */
|
|
|
|
/*
|
|
TODO: TABLE mem root should be used here when VIEW will be stored in
|
|
TABLE cache
|
|
|
|
now Lex placed in statement memory
|
|
*/
|
|
table->view= lex= thd->lex= (LEX*) new(thd->mem_root) st_lex_local;
|
|
lex_start(thd, (uchar*)table->query.str, table->query.length);
|
|
view_select= &lex->select_lex;
|
|
view_select->select_number= ++thd->select_number;
|
|
{
|
|
ulong save_mode= thd->variables.sql_mode;
|
|
/* switch off modes which can prevent normal parsing of VIEW
|
|
- MODE_REAL_AS_FLOAT affect only CREATE TABLE parsing
|
|
+ MODE_PIPES_AS_CONCAT affect expression parsing
|
|
+ MODE_ANSI_QUOTES affect expression parsing
|
|
+ MODE_IGNORE_SPACE affect expression parsing
|
|
- MODE_NOT_USED not used :)
|
|
* MODE_ONLY_FULL_GROUP_BY affect execution
|
|
* MODE_NO_UNSIGNED_SUBTRACTION affect execution
|
|
- MODE_NO_DIR_IN_CREATE affect table creation only
|
|
- MODE_POSTGRESQL compounded from other modes
|
|
- MODE_ORACLE compounded from other modes
|
|
- MODE_MSSQL compounded from other modes
|
|
- MODE_DB2 compounded from other modes
|
|
- MODE_MAXDB affect only CREATE TABLE parsing
|
|
- MODE_NO_KEY_OPTIONS affect only SHOW
|
|
- MODE_NO_TABLE_OPTIONS affect only SHOW
|
|
- MODE_NO_FIELD_OPTIONS affect only SHOW
|
|
- MODE_MYSQL323 affect only SHOW
|
|
- MODE_MYSQL40 affect only SHOW
|
|
- MODE_ANSI compounded from other modes
|
|
(+ transaction mode)
|
|
? MODE_NO_AUTO_VALUE_ON_ZERO affect UPDATEs
|
|
+ MODE_NO_BACKSLASH_ESCAPES affect expression parsing
|
|
*/
|
|
thd->variables.sql_mode&= ~(MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES |
|
|
MODE_IGNORE_SPACE | MODE_NO_BACKSLASH_ESCAPES);
|
|
CHARSET_INFO *save_cs= thd->variables.character_set_client;
|
|
thd->variables.character_set_client= system_charset_info;
|
|
res= MYSQLparse((void *)thd);
|
|
thd->variables.character_set_client= save_cs;
|
|
thd->variables.sql_mode= save_mode;
|
|
}
|
|
if (!res && !thd->is_fatal_error)
|
|
{
|
|
TABLE_LIST *view_tables= lex->query_tables;
|
|
TABLE_LIST *view_tables_tail= 0;
|
|
TABLE_LIST *tbl;
|
|
|
|
/*
|
|
Check rights to run commands (EXPLAIN SELECT & SHOW CREATE) which show
|
|
underlying tables.
|
|
Skip this step if we are opening view for prelocking only.
|
|
*/
|
|
if (!table->prelocking_placeholder &&
|
|
(old_lex->sql_command == SQLCOM_SELECT && old_lex->describe))
|
|
{
|
|
if (check_table_access(thd, SELECT_ACL, view_tables, 1) &&
|
|
check_table_access(thd, SHOW_VIEW_ACL, table, 1))
|
|
{
|
|
my_message(ER_VIEW_NO_EXPLAIN, ER(ER_VIEW_NO_EXPLAIN), MYF(0));
|
|
goto err;
|
|
}
|
|
}
|
|
else if (!table->prelocking_placeholder &&
|
|
old_lex->sql_command == SQLCOM_SHOW_CREATE &&
|
|
!table->belong_to_view)
|
|
{
|
|
if (check_table_access(thd, SHOW_VIEW_ACL, table, 0))
|
|
goto err;
|
|
}
|
|
|
|
if (!(table->view_tables=
|
|
(List<TABLE_LIST>*) new(thd->mem_root) List<TABLE_LIST>))
|
|
goto err;
|
|
/*
|
|
mark to avoid temporary table using and put view reference and find
|
|
last view table
|
|
*/
|
|
for (tbl= view_tables;
|
|
tbl;
|
|
tbl= (view_tables_tail= tbl)->next_global)
|
|
{
|
|
tbl->skip_temporary= 1;
|
|
tbl->belong_to_view= top_view;
|
|
tbl->referencing_view= table;
|
|
tbl->prelocking_placeholder= table->prelocking_placeholder;
|
|
/*
|
|
First we fill want_privilege with SELECT_ACL (this is needed for the
|
|
tables which belongs to view subqueries and temporary table views,
|
|
then for the merged view underlying tables we will set wanted
|
|
privileges of top_view
|
|
*/
|
|
tbl->grant.want_privilege= SELECT_ACL;
|
|
/*
|
|
After unfolding the view we lose the list of tables referenced in it
|
|
(we will have only a list of underlying tables in case of MERGE
|
|
algorithm, which does not include the tables referenced from
|
|
subqueries used in view definition).
|
|
Let's build a list of all tables referenced in the view.
|
|
*/
|
|
table->view_tables->push_back(tbl);
|
|
}
|
|
|
|
/*
|
|
Put tables of VIEW after VIEW TABLE_LIST
|
|
|
|
NOTE: It is important for UPDATE/INSERT/DELETE checks to have this
|
|
tables just after VIEW instead of tail of list, to be able check that
|
|
table is unique. Also we store old next table for the same purpose.
|
|
*/
|
|
if (view_tables)
|
|
{
|
|
if (table->next_global)
|
|
{
|
|
view_tables_tail->next_global= table->next_global;
|
|
table->next_global->prev_global= &view_tables_tail->next_global;
|
|
}
|
|
else
|
|
{
|
|
old_lex->query_tables_last= &view_tables_tail->next_global;
|
|
}
|
|
view_tables->prev_global= &table->next_global;
|
|
table->next_global= view_tables;
|
|
}
|
|
|
|
#ifdef HAVE_ROW_BASED_REPLICATION
|
|
/*
|
|
If the view's body needs row-based binlogging (e.g. the VIEW is created
|
|
from SELECT UUID()), the top statement also needs it.
|
|
*/
|
|
if (lex->binlog_row_based_if_mixed)
|
|
old_lex->binlog_row_based_if_mixed= TRUE;
|
|
#endif
|
|
bool view_is_mergeable= (table->algorithm != VIEW_ALGORITHM_TMPTABLE &&
|
|
lex->can_be_merged());
|
|
TABLE_LIST *view_main_select_tables;
|
|
LINT_INIT(view_main_select_tables);
|
|
|
|
if (view_is_mergeable)
|
|
{
|
|
/*
|
|
Currently 'view_main_select_tables' differs from 'view_tables'
|
|
only then view has CONVERT_TZ() function in its select list.
|
|
This may change in future, for example if we enable merging of
|
|
views with subqueries in select list.
|
|
*/
|
|
view_main_select_tables=
|
|
(TABLE_LIST*)lex->select_lex.table_list.first;
|
|
|
|
/*
|
|
Let us set proper lock type for tables of the view's main
|
|
select since we may want to perform update or insert on
|
|
view. This won't work for view containing union. But this is
|
|
ok since we don't allow insert and update on such views
|
|
anyway.
|
|
*/
|
|
for (tbl= view_main_select_tables; tbl; tbl= tbl->next_local)
|
|
tbl->lock_type= table->lock_type;
|
|
}
|
|
|
|
/*
|
|
If we are opening this view as part of implicit LOCK TABLES, then
|
|
this view serves as simple placeholder and we should not continue
|
|
further processing.
|
|
*/
|
|
if (table->prelocking_placeholder)
|
|
goto ok2;
|
|
|
|
old_lex->derived_tables|= (DERIVED_VIEW | lex->derived_tables);
|
|
|
|
/* move SQL_NO_CACHE & Co to whole query */
|
|
old_lex->safe_to_cache_query= (old_lex->safe_to_cache_query &&
|
|
lex->safe_to_cache_query);
|
|
/* move SQL_CACHE to whole query */
|
|
if (view_select->options & OPTION_TO_QUERY_CACHE)
|
|
old_lex->select_lex.options|= OPTION_TO_QUERY_CACHE;
|
|
|
|
if (table->view_suid)
|
|
{
|
|
/*
|
|
Prepare a security context to check underlying objects of the view
|
|
*/
|
|
Security_context *save_security_ctx= thd->security_ctx;
|
|
if (!(table->view_sctx= (Security_context *)
|
|
thd->stmt_arena->alloc(sizeof(Security_context))))
|
|
goto err;
|
|
/* Assign the context to the tables referenced in the view */
|
|
for (tbl= view_tables; tbl; tbl= tbl->next_global)
|
|
tbl->security_ctx= table->view_sctx;
|
|
/* assign security context to SELECT name resolution contexts of view */
|
|
for(SELECT_LEX *sl= lex->all_selects_list;
|
|
sl;
|
|
sl= sl->next_select_in_list())
|
|
sl->context.security_ctx= table->view_sctx;
|
|
}
|
|
|
|
/*
|
|
Setup an error processor to hide error messages issued by stored
|
|
routines referenced in the view
|
|
*/
|
|
for (SELECT_LEX *sl= lex->all_selects_list;
|
|
sl;
|
|
sl= sl->next_select_in_list())
|
|
{
|
|
sl->context.error_processor= &view_error_processor;
|
|
sl->context.error_processor_data= (void *)table;
|
|
}
|
|
|
|
/*
|
|
check MERGE algorithm ability
|
|
- algorithm is not explicit TEMPORARY TABLE
|
|
- VIEW SELECT allow merging
|
|
- VIEW used in subquery or command support MERGE algorithm
|
|
*/
|
|
if (view_is_mergeable &&
|
|
(table->select_lex->master_unit() != &old_lex->unit ||
|
|
old_lex->can_use_merged()) &&
|
|
!old_lex->can_not_use_merged())
|
|
{
|
|
/* lex should contain at least one table */
|
|
DBUG_ASSERT(view_main_select_tables != 0);
|
|
|
|
List_iterator_fast<TABLE_LIST> ti(view_select->top_join_list);
|
|
|
|
table->effective_algorithm= VIEW_ALGORITHM_MERGE;
|
|
DBUG_PRINT("info", ("algorithm: MERGE"));
|
|
table->updatable= (table->updatable_view != 0);
|
|
table->effective_with_check=
|
|
old_lex->get_effective_with_check(table);
|
|
table->merge_underlying_list= view_main_select_tables;
|
|
|
|
/* Fill correct wanted privileges. */
|
|
for (tbl= view_main_select_tables; tbl; tbl= tbl->next_local)
|
|
tbl->grant.want_privilege= top_view->grant.orig_want_privilege;
|
|
|
|
/* prepare view context */
|
|
lex->select_lex.context.resolve_in_table_list_only(view_main_select_tables);
|
|
lex->select_lex.context.outer_context= 0;
|
|
lex->select_lex.context.select_lex= table->select_lex;
|
|
lex->select_lex.select_n_having_items+=
|
|
table->select_lex->select_n_having_items;
|
|
|
|
/*
|
|
Tables of the main select of the view should be marked as belonging
|
|
to the same select as original view (again we can use LEX::select_lex
|
|
for this purprose because we don't support MERGE algorithm for views
|
|
with unions).
|
|
*/
|
|
for (tbl= lex->select_lex.get_table_list(); tbl; tbl= tbl->next_local)
|
|
tbl->select_lex= table->select_lex;
|
|
|
|
{
|
|
if (view_main_select_tables->next_local)
|
|
{
|
|
table->multitable_view= TRUE;
|
|
if (table->belong_to_view)
|
|
table->belong_to_view->multitable_view= TRUE;
|
|
}
|
|
/* make nested join structure for view tables */
|
|
NESTED_JOIN *nested_join;
|
|
if (!(nested_join= table->nested_join=
|
|
(NESTED_JOIN *) thd->calloc(sizeof(NESTED_JOIN))))
|
|
goto err;
|
|
nested_join->join_list= view_select->top_join_list;
|
|
|
|
/* re-nest tables of VIEW */
|
|
ti.rewind();
|
|
while ((tbl= ti++))
|
|
{
|
|
tbl->join_list= &nested_join->join_list;
|
|
tbl->embedding= table;
|
|
}
|
|
}
|
|
|
|
/* Store WHERE clause for post-processing in setup_underlying */
|
|
table->where= view_select->where;
|
|
/*
|
|
Add subqueries units to SELECT into which we merging current view.
|
|
unit(->next)* chain starts with subqueries that are used by this
|
|
view and continues with subqueries that are used by other views.
|
|
We must not add any subquery twice (otherwise we'll form a loop),
|
|
to do this we remember in end_unit the first subquery that has
|
|
been already added.
|
|
|
|
NOTE: we do not support UNION here, so we take only one select
|
|
*/
|
|
SELECT_LEX_NODE *end_unit= table->select_lex->slave;
|
|
SELECT_LEX_UNIT *next_unit;
|
|
for (SELECT_LEX_UNIT *unit= lex->select_lex.first_inner_unit();
|
|
unit;
|
|
unit= next_unit)
|
|
{
|
|
if (unit == end_unit)
|
|
break;
|
|
SELECT_LEX_NODE *save_slave= unit->slave;
|
|
next_unit= unit->next_unit();
|
|
unit->include_down(table->select_lex);
|
|
unit->slave= save_slave; // fix include_down initialisation
|
|
}
|
|
|
|
/*
|
|
This SELECT_LEX will be linked in global SELECT_LEX list
|
|
to make it processed by mysql_handle_derived(),
|
|
but it will not be included to SELECT_LEX tree, because it
|
|
will not be executed
|
|
*/
|
|
goto ok;
|
|
}
|
|
|
|
table->effective_algorithm= VIEW_ALGORITHM_TMPTABLE;
|
|
DBUG_PRINT("info", ("algorithm: TEMPORARY TABLE"));
|
|
view_select->linkage= DERIVED_TABLE_TYPE;
|
|
table->updatable= 0;
|
|
table->effective_with_check= VIEW_CHECK_NONE;
|
|
old_lex->subqueries= TRUE;
|
|
|
|
/* SELECT tree link */
|
|
lex->unit.include_down(table->select_lex);
|
|
lex->unit.slave= view_select; // fix include_down initialisation
|
|
|
|
table->derived= &lex->unit;
|
|
}
|
|
else
|
|
goto err;
|
|
|
|
ok:
|
|
/* global SELECT list linking */
|
|
end= view_select; // primary SELECT_LEX is always last
|
|
end->link_next= old_lex->all_selects_list;
|
|
old_lex->all_selects_list->link_prev= &end->link_next;
|
|
old_lex->all_selects_list= lex->all_selects_list;
|
|
lex->all_selects_list->link_prev=
|
|
(st_select_lex_node**)&old_lex->all_selects_list;
|
|
|
|
ok2:
|
|
if (!old_lex->time_zone_tables_used && thd->lex->time_zone_tables_used)
|
|
old_lex->time_zone_tables_used= thd->lex->time_zone_tables_used;
|
|
DBUG_ASSERT(lex == thd->lex);
|
|
thd->lex= old_lex; // Needed for prepare_security
|
|
result= !table->prelocking_placeholder && table->prepare_security(thd);
|
|
|
|
lex_end(lex);
|
|
end:
|
|
if (arena)
|
|
thd->restore_active_arena(arena, &backup);
|
|
thd->lex= old_lex;
|
|
DBUG_RETURN(result);
|
|
|
|
err:
|
|
DBUG_ASSERT(thd->lex == table->view);
|
|
lex_end(thd->lex);
|
|
delete table->view;
|
|
table->view= 0; // now it is not VIEW placeholder
|
|
result= 1;
|
|
goto end;
|
|
}
|
|
|
|
|
|
/*
|
|
drop view
|
|
|
|
SYNOPSIS
|
|
mysql_drop_view()
|
|
thd - thread handler
|
|
views - views to delete
|
|
drop_mode - cascade/check
|
|
|
|
RETURN VALUE
|
|
FALSE OK
|
|
TRUE Error
|
|
*/
|
|
|
|
bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
|
|
{
|
|
char path[FN_REFLEN];
|
|
TABLE_LIST *view;
|
|
String non_existant_views;
|
|
char *wrong_object_db= NULL, *wrong_object_name= NULL;
|
|
bool error= FALSE;
|
|
enum legacy_db_type not_used;
|
|
DBUG_ENTER("mysql_drop_view");
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_open));
|
|
for (view= views; view; view= view->next_local)
|
|
{
|
|
TABLE_SHARE *share;
|
|
frm_type_enum type= FRMTYPE_ERROR;
|
|
build_table_filename(path, sizeof(path),
|
|
view->db, view->table_name, reg_ext, 0);
|
|
|
|
if (access(path, F_OK) ||
|
|
FRMTYPE_VIEW != (type= mysql_frm_type(thd, path, ¬_used)))
|
|
{
|
|
char name[FN_REFLEN];
|
|
my_snprintf(name, sizeof(name), "%s.%s", view->db, view->table_name);
|
|
if (thd->lex->drop_if_exists)
|
|
{
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
ER_BAD_TABLE_ERROR, ER(ER_BAD_TABLE_ERROR),
|
|
name);
|
|
continue;
|
|
}
|
|
if (type == FRMTYPE_TABLE)
|
|
{
|
|
if (!wrong_object_name)
|
|
{
|
|
wrong_object_db= view->db;
|
|
wrong_object_name= view->table_name;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (non_existant_views.length())
|
|
non_existant_views.append(',');
|
|
non_existant_views.append(String(view->table_name,system_charset_info));
|
|
}
|
|
continue;
|
|
}
|
|
if (my_delete(path, MYF(MY_WME)))
|
|
error= TRUE;
|
|
|
|
/*
|
|
For a view, there is only one table_share object which should never
|
|
be used outside of LOCK_open
|
|
*/
|
|
if ((share= get_cached_table_share(view->db, view->table_name)))
|
|
{
|
|
DBUG_ASSERT(share->ref_count == 0);
|
|
pthread_mutex_lock(&share->mutex);
|
|
share->ref_count++;
|
|
share->version= 0;
|
|
pthread_mutex_unlock(&share->mutex);
|
|
release_table_share(share, RELEASE_WAIT_FOR_DROP);
|
|
}
|
|
query_cache_invalidate3(thd, view, 0);
|
|
sp_cache_invalidate();
|
|
}
|
|
|
|
if (error)
|
|
{
|
|
VOID(pthread_mutex_unlock(&LOCK_open));
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
if (wrong_object_name)
|
|
{
|
|
VOID(pthread_mutex_unlock(&LOCK_open));
|
|
my_error(ER_WRONG_OBJECT, MYF(0), wrong_object_db, wrong_object_name,
|
|
"VIEW");
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
if (non_existant_views.length())
|
|
{
|
|
VOID(pthread_mutex_unlock(&LOCK_open));
|
|
my_error(ER_BAD_TABLE_ERROR, MYF(0), non_existant_views.c_ptr());
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
|
|
if (mysql_bin_log.is_open())
|
|
{
|
|
thd->clear_error();
|
|
thd->binlog_query(THD::STMT_QUERY_TYPE,
|
|
thd->query, thd->query_length, FALSE, FALSE);
|
|
}
|
|
|
|
send_ok(thd);
|
|
VOID(pthread_mutex_unlock(&LOCK_open));
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
/*
|
|
Check type of .frm if we are not going to parse it
|
|
|
|
SYNOPSIS
|
|
mysql_frm_type()
|
|
path path to file
|
|
|
|
RETURN
|
|
FRMTYPE_ERROR error
|
|
FRMTYPE_TABLE table
|
|
FRMTYPE_VIEW view
|
|
*/
|
|
|
|
frm_type_enum mysql_frm_type(THD *thd, char *path, enum legacy_db_type *dbt)
|
|
{
|
|
File file;
|
|
uchar header[10]; //"TYPE=VIEW\n" it is 10 characters
|
|
int error;
|
|
DBUG_ENTER("mysql_frm_type");
|
|
|
|
*dbt= DB_TYPE_UNKNOWN;
|
|
|
|
if ((file= my_open(path, O_RDONLY | O_SHARE, MYF(0))) < 0)
|
|
DBUG_RETURN(FRMTYPE_ERROR);
|
|
error= my_read(file, (byte*) header, sizeof(header), MYF(MY_WME | MY_NABP));
|
|
my_close(file, MYF(MY_WME));
|
|
|
|
if (error)
|
|
DBUG_RETURN(FRMTYPE_ERROR);
|
|
if (!strncmp((char*) header, "TYPE=VIEW\n", sizeof(header)))
|
|
DBUG_RETURN(FRMTYPE_VIEW);
|
|
|
|
/*
|
|
This is just a check for DB_TYPE. We'll return default unknown type
|
|
if the following test is true (arg #3). This should not have effect
|
|
on return value from this function (default FRMTYPE_TABLE)
|
|
*/
|
|
if (header[0] != (uchar) 254 || header[1] != 1 ||
|
|
(header[2] != FRM_VER && header[2] != FRM_VER+1 &&
|
|
(header[2] < FRM_VER+3 || header[2] > FRM_VER+4)))
|
|
DBUG_RETURN(FRMTYPE_TABLE);
|
|
|
|
*dbt= (enum legacy_db_type) (uint) *(header + 3);
|
|
DBUG_RETURN(FRMTYPE_TABLE); // Is probably a .frm table
|
|
}
|
|
|
|
|
|
/*
|
|
check of key (primary or unique) presence in updatable view
|
|
|
|
SYNOPSIS
|
|
check_key_in_view()
|
|
thd thread handler
|
|
view view for check with opened table
|
|
|
|
DESCRIPTION
|
|
If it is VIEW and query have LIMIT clause then check that underlying
|
|
table of view contain one of following:
|
|
1) primary key of underlying table
|
|
2) unique key underlying table with fields for which NULL value is
|
|
impossible
|
|
3) all fields of underlying table
|
|
|
|
RETURN
|
|
FALSE OK
|
|
TRUE view do not contain key or all fields
|
|
*/
|
|
|
|
bool check_key_in_view(THD *thd, TABLE_LIST *view)
|
|
{
|
|
TABLE *table;
|
|
Field_translator *trans, *end_of_trans;
|
|
KEY *key_info, *key_info_end;
|
|
DBUG_ENTER("check_key_in_view");
|
|
|
|
/*
|
|
we do not support updatable UNIONs in VIEW, so we can check just limit of
|
|
LEX::select_lex
|
|
*/
|
|
if ((!view->view && !view->belong_to_view) ||
|
|
thd->lex->sql_command == SQLCOM_INSERT ||
|
|
thd->lex->select_lex.select_limit == 0)
|
|
DBUG_RETURN(FALSE); /* it is normal table or query without LIMIT */
|
|
table= view->table;
|
|
view= view->top_table();
|
|
trans= view->field_translation;
|
|
key_info_end= (key_info= table->key_info)+ table->s->keys;
|
|
|
|
end_of_trans= view->field_translation_end;
|
|
DBUG_ASSERT(table != 0 && view->field_translation != 0);
|
|
|
|
{
|
|
/*
|
|
We should be sure that all fields are ready to get keys from them, but
|
|
this operation should not have influence on Field::query_id, to avoid
|
|
marking as used fields which are not used
|
|
*/
|
|
enum_mark_columns save_mark_used_columns= thd->mark_used_columns;
|
|
thd->mark_used_columns= MARK_COLUMNS_NONE;
|
|
DBUG_PRINT("info", ("thd->mark_used_columns: %d", thd->mark_used_columns));
|
|
for (Field_translator *fld= trans; fld < end_of_trans; fld++)
|
|
{
|
|
if (!fld->item->fixed && fld->item->fix_fields(thd, &fld->item))
|
|
{
|
|
thd->mark_used_columns= save_mark_used_columns;
|
|
return TRUE;
|
|
}
|
|
}
|
|
thd->mark_used_columns= save_mark_used_columns;
|
|
DBUG_PRINT("info", ("thd->mark_used_columns: %d", thd->mark_used_columns));
|
|
}
|
|
/* Loop over all keys to see if a unique-not-null key is used */
|
|
for (;key_info != key_info_end ; key_info++)
|
|
{
|
|
if ((key_info->flags & (HA_NOSAME | HA_NULL_PART_KEY)) == HA_NOSAME)
|
|
{
|
|
KEY_PART_INFO *key_part= key_info->key_part;
|
|
KEY_PART_INFO *key_part_end= key_part + key_info->key_parts;
|
|
|
|
/* check that all key parts are used */
|
|
for (;;)
|
|
{
|
|
Field_translator *k;
|
|
for (k= trans; k < end_of_trans; k++)
|
|
{
|
|
Item_field *field;
|
|
if ((field= k->item->filed_for_view_update()) &&
|
|
field->field == key_part->field)
|
|
break;
|
|
}
|
|
if (k == end_of_trans)
|
|
break; // Key is not possible
|
|
if (++key_part == key_part_end)
|
|
DBUG_RETURN(FALSE); // Found usable key
|
|
}
|
|
}
|
|
}
|
|
|
|
DBUG_PRINT("info", ("checking if all fields of table are used"));
|
|
/* check all fields presence */
|
|
{
|
|
Field **field_ptr;
|
|
Field_translator *fld;
|
|
for (field_ptr= table->field; *field_ptr; field_ptr++)
|
|
{
|
|
for (fld= trans; fld < end_of_trans; fld++)
|
|
{
|
|
Item_field *field;
|
|
if ((field= fld->item->filed_for_view_update()) &&
|
|
field->field == *field_ptr)
|
|
break;
|
|
}
|
|
if (fld == end_of_trans) // If field didn't exists
|
|
{
|
|
/*
|
|
Keys or all fields of underlying tables are not found => we have
|
|
to check variable updatable_views_with_limit to decide should we
|
|
issue an error or just a warning
|
|
*/
|
|
if (thd->variables.updatable_views_with_limit)
|
|
{
|
|
/* update allowed, but issue warning */
|
|
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
ER_WARN_VIEW_WITHOUT_KEY, ER(ER_WARN_VIEW_WITHOUT_KEY));
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
/* prohibit update */
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
}
|
|
}
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
|
|
/*
|
|
insert fields from VIEW (MERGE algorithm) into given list
|
|
|
|
SYNOPSIS
|
|
insert_view_fields()
|
|
thd thread handler
|
|
list list for insertion
|
|
view view for processing
|
|
|
|
RETURN
|
|
FALSE OK
|
|
TRUE error (is not sent to cliet)
|
|
*/
|
|
|
|
bool insert_view_fields(THD *thd, List<Item> *list, TABLE_LIST *view)
|
|
{
|
|
Field_translator *trans_end;
|
|
Field_translator *trans;
|
|
DBUG_ENTER("insert_view_fields");
|
|
|
|
if (!(trans= view->field_translation))
|
|
DBUG_RETURN(FALSE);
|
|
trans_end= view->field_translation_end;
|
|
|
|
for (Field_translator *entry= trans; entry < trans_end; entry++)
|
|
{
|
|
Item_field *fld;
|
|
if ((fld= entry->item->filed_for_view_update()))
|
|
list->push_back(fld);
|
|
else
|
|
{
|
|
my_error(ER_NON_INSERTABLE_TABLE, MYF(0), view->alias, "INSERT");
|
|
DBUG_RETURN(TRUE);
|
|
}
|
|
}
|
|
DBUG_RETURN(FALSE);
|
|
}
|
|
|
|
/*
|
|
checking view md5 check suum
|
|
|
|
SINOPSYS
|
|
view_checksum()
|
|
thd threar handler
|
|
view view for check
|
|
|
|
RETUIRN
|
|
HA_ADMIN_OK OK
|
|
HA_ADMIN_NOT_IMPLEMENTED it is not VIEW
|
|
HA_ADMIN_WRONG_CHECKSUM check sum is wrong
|
|
*/
|
|
|
|
int view_checksum(THD *thd, TABLE_LIST *view)
|
|
{
|
|
char md5[MD5_BUFF_LENGTH];
|
|
if (!view->view || view->md5.length != 32)
|
|
return HA_ADMIN_NOT_IMPLEMENTED;
|
|
view->calc_md5(md5);
|
|
return (strncmp(md5, view->md5.str, 32) ?
|
|
HA_ADMIN_WRONG_CHECKSUM :
|
|
HA_ADMIN_OK);
|
|
}
|
|
|
|
/*
|
|
rename view
|
|
|
|
Synopsis:
|
|
renames a view
|
|
|
|
Parameters:
|
|
thd thread handler
|
|
new_name new name of view
|
|
view view
|
|
|
|
Return values:
|
|
FALSE Ok
|
|
TRUE Error
|
|
*/
|
|
bool
|
|
mysql_rename_view(THD *thd,
|
|
const char *new_name,
|
|
TABLE_LIST *view)
|
|
{
|
|
LEX_STRING pathstr;
|
|
File_parser *parser;
|
|
char path_buff[FN_REFLEN];
|
|
bool error= TRUE;
|
|
DBUG_ENTER("mysql_rename_view");
|
|
|
|
pathstr.str= (char *) path_buff;
|
|
pathstr.length= build_table_filename(path_buff, sizeof(path_buff) - 1,
|
|
view->db, view->table_name,
|
|
reg_ext, 0);
|
|
|
|
if ((parser= sql_parse_prepare(&pathstr, thd->mem_root, 1)) &&
|
|
is_equal(&view_type, parser->type()))
|
|
{
|
|
TABLE_LIST view_def;
|
|
char dir_buff[FN_REFLEN];
|
|
LEX_STRING dir, file;
|
|
|
|
/*
|
|
To be PS-friendly we should either to restore state of
|
|
TABLE_LIST object pointed by 'view' after using it for
|
|
view definition parsing or use temporary 'view_def'
|
|
object for it.
|
|
*/
|
|
bzero(&view_def, sizeof(view_def));
|
|
view_def.timestamp.str= view_def.timestamp_buffer;
|
|
view_def.view_suid= TRUE;
|
|
|
|
/* get view definition and source */
|
|
if (parser->parse((gptr)&view_def, thd->mem_root, view_parameters,
|
|
array_elements(view_parameters)-1,
|
|
&file_parser_dummy_hook))
|
|
goto err;
|
|
|
|
/* rename view and it's backups */
|
|
if (rename_in_schema_file(view->db, view->table_name, new_name,
|
|
view_def.revision - 1, num_view_backups))
|
|
goto err;
|
|
|
|
dir.str= dir_buff;
|
|
dir.length= build_table_filename(dir_buff, sizeof(dir_buff) - 1,
|
|
view->db, "", "", 0);
|
|
|
|
pathstr.str= path_buff;
|
|
pathstr.length= build_table_filename(path_buff, sizeof(path_buff) - 1,
|
|
view->db, new_name, reg_ext, 0);
|
|
|
|
file.str= pathstr.str + dir.length;
|
|
file.length= pathstr.length - dir.length;
|
|
|
|
if (sql_create_definition_file(&dir, &file, view_file_type,
|
|
(gptr)&view_def, view_parameters,
|
|
num_view_backups))
|
|
{
|
|
/* restore renamed view in case of error */
|
|
rename_in_schema_file(view->db, new_name, view->table_name,
|
|
view_def.revision - 1, num_view_backups);
|
|
goto err;
|
|
}
|
|
} else
|
|
DBUG_RETURN(1);
|
|
|
|
/* remove cache entries */
|
|
query_cache_invalidate3(thd, view, 0);
|
|
sp_cache_invalidate();
|
|
error= FALSE;
|
|
|
|
err:
|
|
DBUG_RETURN(error);
|
|
}
|