mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
4dabfa5de7
into mysql.com:/home/kent/bk/main/mysql-5.1 BUILD/Makefile.am: Auto merged BitKeeper/deleted/.del-ArrayFifoList.hpp~7036ae04dd7e7bd2: Auto merged BitKeeper/deleted/.del-ArrayList.hpp~44695d09b1a02179: Auto merged BitKeeper/deleted/.del-DbtupLCP.cpp~855b1ed3fbc86a42: Auto merged BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d: Auto merged BitKeeper/deleted/.del-DbtupUndoLog.cpp~5a2ef6e86b1404e9: Auto merged Makefile.am: Auto merged BitKeeper/deleted/.del-Makefile.am~2: Auto merged BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e: Auto merged BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7: Auto merged BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6: Auto merged BitKeeper/deleted/.del-Makefile.am~e5b911533dad2713: Auto merged BitKeeper/deleted/.del-Makefile.am~ead19441cc5ff35c: Auto merged BitKeeper/deleted/.del-Makefile.am~f87185e232d7c4f: Auto merged BitKeeper/deleted/.del-Makefile.in: Auto merged BitKeeper/deleted/.del-MemoryChannelOSE.hpp: Auto merged BitKeeper/deleted/.del-MetaData.cpp~146ae9865dd35829: Auto merged BitKeeper/deleted/.del-MetaData.hpp~538342afcd8ac53c: Auto merged BitKeeper/deleted/.del-NdbCondition.c~ad83464328ab37af: Auto merged BitKeeper/deleted/.del-NdbCondition.c~ee56562abdd718cf: Auto merged BitKeeper/deleted/.del-NdbConditionOSE.h~455dd2c29c2e6344: Auto merged BitKeeper/deleted/.del-NdbDaemon.c~3b8101f376b28df: Auto merged BitKeeper/deleted/.del-NdbEnv.c~207f9ce9754c9e8a: Auto merged BitKeeper/deleted/.del-NdbEnv.c~bb6fe7572d45288a: Auto merged BitKeeper/deleted/.del-NdbErrHnd.cpp: Auto merged BitKeeper/deleted/.del-NdbHost.c~2c29816c77396d7b: Auto merged BitKeeper/deleted/.del-NdbHost.c~cf18d6b3c825180c: Auto merged BitKeeper/deleted/.del-NdbMem.c~6285b159985d46da: Auto merged BitKeeper/deleted/.del-NdbMem.c~6c2b317c1ce230ab: Auto merged BitKeeper/deleted/.del-NdbMem_SoftOse.cpp~9c61e311ec168d44: Auto merged BitKeeper/deleted/.del-NdbMutex.c~768131269bccca10: Auto merged BitKeeper/deleted/.del-NdbMutex.c~f4bdd19be08b84ab: Auto merged BitKeeper/deleted/.del-NdbOut.cpp~8caa99a0d729540c: Auto merged BitKeeper/deleted/.del-NdbSleep.c~b643ea3e7103eb62: Auto merged BitKeeper/deleted/.del-NdbSleep.c~b88fbc5b140de10d: Auto merged BitKeeper/deleted/.del-NdbTCP.c~1e9f416992352f6d: Auto merged BitKeeper/deleted/.del-NdbTCP.c~b09cdcbef3ea2c57: Auto merged BitKeeper/deleted/.del-NdbThread.c~2fe1fa5f47801772: Auto merged BitKeeper/deleted/.del-NdbThread.c~fe71a67b5c3a4724: Auto merged BitKeeper/deleted/.del-NdbTick.c~aa6385567216509d: Auto merged BitKeeper/deleted/.del-NdbTick.c~b76feba2cf1493d1: Auto merged BitKeeper/deleted/.del-OSE_Receiver.cpp: Auto merged BitKeeper/deleted/.del-OSE_Receiver.hpp: Auto merged BitKeeper/deleted/.del-OSE_Signals.hpp: Auto merged BitKeeper/deleted/.del-OSE_Transporter.cpp: Auto merged BitKeeper/deleted/.del-OSE_Transporter.hpp: Auto merged BitKeeper/deleted/.del-TraceNdbApi.hpp~7a7f0ae5b70358bc: Auto merged BitKeeper/deleted/.del-VerifyNdbApi.hpp~f417f78f7cd05935: Auto merged BitKeeper/deleted/.del-bcd.h~81fbfcc1530534da: Auto merged BitKeeper/deleted/.del-config-os2.h~a16b51851ddd317b: Auto merged BitKeeper/deleted/.del-dbGenerator.c~7509c19f70cad0bf: Auto merged BitKeeper/deleted/.del-dbGenerator.h~63f1aeb98260bcb7: Auto merged BitKeeper/deleted/.del-dbGenerator.h~e1aaa6725999d458: Auto merged BitKeeper/deleted/.del-dbPopulate.c~5dcff1c99783d83b: Auto merged BitKeeper/deleted/.del-dbPopulate.h~229a894b59d4da73: Auto merged BitKeeper/deleted/.del-ha_berkeley.cc: Auto merged BitKeeper/deleted/.del-ha_berkeley.h: Auto merged BitKeeper/deleted/.del-localDbPrepare.c~33a2c46afc8fac9a: Auto merged BitKeeper/deleted/.del-macros.h~58097d584e29b5df: Auto merged BitKeeper/deleted/.del-macros.h~742871fab0681964: Auto merged BitKeeper/deleted/.del-mainGenerator.c~2d1c8016f72b2517: Auto merged BitKeeper/deleted/.del-mainPopulate.c~37def9a44980b8ec: Auto merged BitKeeper/deleted/.del-mgmapi_logevent.cpp~f1e7cf3e70edc4: Auto merged BitKeeper/deleted/.del-mmslist.cpp: Auto merged BitKeeper/deleted/.del-my_lread.c: Auto merged BitKeeper/deleted/.del-my_lwrite.c: Auto merged BitKeeper/deleted/.del-my_os2cond.c~e3b520af1c371bb5: Auto merged BitKeeper/deleted/.del-my_os2dirsrch.c~4e2479b2abb2eb5a: Auto merged BitKeeper/deleted/.del-my_os2dirsrch.h~5011cbc657537d0: Auto merged BitKeeper/deleted/.del-my_os2dlfcn.c~6d94b488717683dd: Auto merged BitKeeper/deleted/.del-my_os2dlfcn.h0~eae8edb8555eff87: Auto merged BitKeeper/deleted/.del-my_os2file64.c~251fb8a1e950c31b: Auto merged BitKeeper/deleted/.del-my_os2thread.c~65dca991548cec2a: Auto merged BitKeeper/deleted/.del-my_os2tls.c~58ade7a0f70ad5ea: Auto merged BitKeeper/deleted/.del-mysqlmanager-pwgen.c~d8f5f91ec54432b9: Auto merged BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Auto merged BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6: Auto merged BitKeeper/deleted/.del-ndb_error.hpp~24468bb7f20a0b41: Auto merged BitKeeper/deleted/.del-ndb_error.hpp~45a2fef922beae3: Auto merged BitKeeper/deleted/.del-ndb_schema.hpp~de9c21185d6bfe4e: Auto merged BitKeeper/deleted/.del-ndbapi_async.cpp~319189569fb659ec: Auto merged BitKeeper/deleted/.del-ndbapi_async1.cpp~2995dac9b963a0d: Auto merged BitKeeper/deleted/.del-ndbapi_event.cpp~c5d949802966180: Auto merged BitKeeper/deleted/.del-ndbapi_retries.cpp~7301496d8c1c310a: Auto merged BitKeeper/deleted/.del-ndbapi_scan.cpp~14ed2aa9a5d9e597: Auto merged BitKeeper/deleted/.del-ndbapi_simple.cpp~80962179f3c2f5b8: Auto merged BitKeeper/deleted/.del-ndbapi_simple_index.cpp~4b95a4d71808b5b6: Auto merged BitKeeper/deleted/.del-print-limit-table~b8e808031daa3758: Auto merged BitKeeper/deleted/.del-raid.cc~488f5fa6538394e1: Auto merged BitKeeper/deleted/.del-raid.h~2d2503a66b128ac6: Auto merged BitKeeper/deleted/.del-raid2.c~fe7aea5fb4b9748c: Auto merged BitKeeper/deleted/.del-sql_manager.h: Auto merged BitKeeper/deleted/.del-testData.h~696038ea2623a90b: Auto merged BitKeeper/deleted/.del-testData.h~898b71d7c639319e: Auto merged BitKeeper/deleted/.del-testDefinitions.h~f18a4553579a3725: Auto merged BitKeeper/deleted/.del-userHandle.h~3275bb415e1ca2c2: Auto merged BitKeeper/deleted/.del-userHandle.h~ec22dc7a7ed2f81b: Auto merged BitKeeper/deleted/.del-userInterface.cpp~82ee612ab14b3d48: Auto merged BitKeeper/deleted/.del-userInterface.c~92a20032f7d1e91: Auto merged BitKeeper/deleted/.del-userInterface.h~1f76ad2f28b283fd: Auto merged BitKeeper/deleted/.del-userInterface.h~49139f029bbdaabc: Auto merged BitKeeper/deleted/.del-userTransaction.c~438012ecc761b776: Auto merged BitKeeper/deleted/.del-userTransaction.c~f50661b4f54b0bdd: Auto merged BitKeeper/deleted/.del-utv.h~f64af026b9705ebb: Auto merged BitKeeper/deleted/.del-vcdrfunc.h~85803875180684cd: Auto merged BitKeeper/deleted/.del-waiter.cpp~b188e4bfddf2cf98: Auto merged Docs/Makefile.am: Auto merged client/Makefile.am: Auto merged client/client_priv.h: Auto merged client/get_password.c: Auto merged client/mysql.cc: Auto merged client/mysql_upgrade.c: Auto merged client/mysqladmin.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged dbug/Makefile.am: Auto merged extra/Makefile.am: Auto merged extra/comp_err.c: Auto merged extra/perror.c: Auto merged extra/replace.c: Auto merged extra/resolveip.c: Auto merged include/Makefile.am: Auto merged include/base64.h: Auto merged include/config-netware.h: Auto merged include/config-win.h: Auto merged include/decimal.h: Auto merged include/errmsg.h: Auto merged include/ft_global.h: Auto merged include/heap.h: Auto merged include/m_ctype.h: Auto merged include/m_string.h: Auto merged include/my_base.h: Auto merged include/my_bitmap.h: Auto merged include/my_dbug.h: Auto merged include/my_global.h: Auto merged include/my_net.h: Auto merged include/my_no_pthread.h: Auto merged include/my_nosys.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/my_time.h: Auto merged include/my_tree.h: Auto merged include/my_xml.h: Auto merged include/myisam.h: Auto merged include/myisammrg.h: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged include/mysys_err.h: Auto merged include/queues.h: Auto merged include/thr_alarm.h: Auto merged include/thr_lock.h: Auto merged include/violite.h: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/emb_qcache.cc: Auto merged libmysqld/embedded_priv.h: Auto merged libmysqld/examples/Makefile.am: Auto merged libmysqld/libmysqld.c: Auto merged mysql-test/Makefile.am: Auto merged mysys/Makefile.am: Auto merged mysys/array.c: Auto merged mysys/base64.c: Auto merged mysys/charset-def.c: Auto merged mysys/default.c: Auto merged mysys/default_modify.c: Auto merged mysys/errors.c: Auto merged mysys/hash.c: Auto merged mysys/mf_dirname.c: Auto merged mysys/mf_format.c: Auto merged mysys/mf_iocache.c: Auto merged mysys/mf_iocache2.c: Auto merged mysys/mf_keycache.c: Auto merged mysys/mf_pack.c: Auto merged mysys/mf_path.c: Auto merged mysys/mf_tempdir.c: Auto merged mysys/mf_tempfile.c: Auto merged mysys/my_access.c: Auto merged mysys/my_alloc.c: Auto merged mysys/my_append.c: Auto merged mysys/my_bit.c: Auto merged mysys/my_bitmap.c: Auto merged mysys/my_clock.c: Auto merged mysys/my_compress.c: Auto merged mysys/my_copy.c: Auto merged mysys/my_create.c: Auto merged mysys/my_dup.c: Auto merged mysys/my_error.c: Auto merged mysys/my_file.c: Auto merged mysys/my_gethostbyname.c: Auto merged mysys/my_getopt.c: Auto merged mysys/my_getwd.c: Auto merged mysys/my_handler.c: Auto merged mysys/my_init.c: Auto merged mysys/my_lib.c: Auto merged mysys/my_lock.c: Auto merged mysys/my_malloc.c: Auto merged mysys/my_mkdir.c: Auto merged mysys/my_mmap.c: Auto merged mysys/my_net.c: Auto merged mysys/my_once.c: Auto merged mysys/my_open.c: Auto merged mysys/my_pread.c: Auto merged mysys/my_pthread.c: Auto merged mysys/my_redel.c: Auto merged mysys/my_rename.c: Auto merged mysys/my_seek.c: Auto merged mysys/my_sleep.c: Auto merged mysys/my_static.c: Auto merged mysys/my_symlink2.c: Auto merged mysys/my_thr_init.c: Auto merged mysys/mysys_priv.h: Auto merged mysys/ptr_cmp.c: Auto merged mysys/queues.c: Auto merged mysys/safemalloc.c: Auto merged mysys/string.c: Auto merged mysys/test_dir.c: Auto merged mysys/testhash.c: Auto merged mysys/thr_alarm.c: Auto merged mysys/thr_lock.c: Auto merged mysys/thr_mutex.c: Auto merged regex/Makefile.am: Auto merged scripts/Makefile.am: Auto merged server-tools/instance-manager/Makefile.am: Auto merged server-tools/instance-manager/buffer.cc: Auto merged server-tools/instance-manager/command.cc: Auto merged server-tools/instance-manager/command.h: Auto merged server-tools/instance-manager/commands.cc: Auto merged server-tools/instance-manager/commands.h: Auto merged server-tools/instance-manager/guardian.cc: Auto merged server-tools/instance-manager/guardian.h: Auto merged server-tools/instance-manager/instance.cc: Auto merged server-tools/instance-manager/instance.h: Auto merged server-tools/instance-manager/instance_map.cc: Auto merged server-tools/instance-manager/instance_map.h: Auto merged server-tools/instance-manager/instance_options.cc: Auto merged server-tools/instance-manager/instance_options.h: Auto merged server-tools/instance-manager/listener.cc: Auto merged server-tools/instance-manager/listener.h: Auto merged server-tools/instance-manager/log.cc: Auto merged server-tools/instance-manager/log.h: Auto merged server-tools/instance-manager/manager.cc: Auto merged server-tools/instance-manager/manager.h: Auto merged server-tools/instance-manager/messages.cc: Auto merged server-tools/instance-manager/mysql_connection.cc: Auto merged server-tools/instance-manager/mysql_connection.h: Auto merged server-tools/instance-manager/mysql_manager_error.h: Auto merged server-tools/instance-manager/mysqlmanager.cc: Auto merged server-tools/instance-manager/options.cc: Auto merged server-tools/instance-manager/options.h: Auto merged server-tools/instance-manager/parse.cc: Auto merged server-tools/instance-manager/parse.h: Auto merged server-tools/instance-manager/parse_output.cc: Auto merged server-tools/instance-manager/parse_output.h: Auto merged server-tools/instance-manager/priv.cc: Auto merged server-tools/instance-manager/priv.h: Auto merged server-tools/instance-manager/protocol.cc: Auto merged server-tools/instance-manager/protocol.h: Auto merged server-tools/instance-manager/thread_registry.cc: Auto merged server-tools/instance-manager/thread_registry.h: Auto merged server-tools/instance-manager/user_map.cc: Auto merged server-tools/instance-manager/user_map.h: Auto merged sql/Makefile.am: Auto merged sql/discover.cc: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/field_conv.cc: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/init.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_create.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_geofunc.cc: Auto merged sql/item_geofunc.h: Auto merged sql/item_row.cc: Auto merged sql/item_row.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/item_uniq.cc: Auto merged sql/key.cc: Auto merged sql/lex.h: Auto merged sql/lex_symbol.h: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/my_decimal.cc: Auto merged sql/my_decimal.h: Auto merged sql/my_lock.c: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/parse_file.cc: Auto merged sql/parse_file.h: Auto merged sql/password.c: Auto merged sql/procedure.h: Auto merged sql/protocol.cc: Auto merged sql/protocol.h: Auto merged sql/records.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sp.cc: Auto merged sql/sp.h: Auto merged sql/sp_cache.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/spatial.cc: Auto merged sql/spatial.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_analyse.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_bitmap.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_crypt.cc: Auto merged sql/sql_cursor.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_derived.cc: Auto merged sql/sql_do.cc: Auto merged sql/sql_error.cc: Auto merged sql/sql_error.h: Auto merged sql/sql_handler.cc: Auto merged sql/sql_help.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_manager.cc: Auto merged sql/sql_map.cc: Auto merged sql/sql_olap.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_string.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_trigger.h: Auto merged sql/sql_udf.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql-bench/Makefile.am: Auto merged sql-bench/as3ap.sh: Auto merged sql-bench/bench-count-distinct.sh: Auto merged sql-bench/bench-init.pl.sh: Auto merged sql-bench/compare-results.sh: Auto merged sql-bench/copy-db.sh: Auto merged sql/share/charsets/Index.xml: Auto merged sql/share/charsets/cp1250.xml: Auto merged sql/sql_view.h: Auto merged sql/sql_yacc.yy: Auto merged sql/stacktrace.c: Auto merged sql/stacktrace.h: Auto merged sql/strfunc.cc: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/time.cc: Auto merged sql/tztime.cc: Auto merged sql/tztime.h: Auto merged sql/udf_example.c: Auto merged sql/unireg.cc: Auto merged sql/unireg.h: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/run-all-tests.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql-bench/test-ATIS.sh: Auto merged sql-bench/test-alter-table.sh: Auto merged sql-bench/test-big-tables.sh: Auto merged sql-bench/test-connect.sh: Auto merged sql-bench/test-create.sh: Auto merged sql-bench/test-insert.sh: Auto merged sql-bench/test-select.sh: Auto merged sql-bench/test-transactions.sh: Auto merged sql-bench/test-wisconsin.sh: Auto merged sql-common/client.c: Auto merged sql-common/my_time.c: Auto merged storage/archive/ha_archive.cc: Auto merged storage/archive/ha_archive.h: Auto merged storage/blackhole/ha_blackhole.cc: Auto merged storage/blackhole/ha_blackhole.h: Auto merged storage/csv/ha_tina.cc: Auto merged storage/csv/ha_tina.h: Auto merged storage/example/ha_example.cc: Auto merged storage/example/ha_example.h: Auto merged storage/federated/ha_federated.cc: Auto merged storage/federated/ha_federated.h: Auto merged storage/heap/Makefile.am: Auto merged storage/heap/_check.c: Auto merged storage/heap/_rectest.c: Auto merged storage/heap/ha_heap.cc: Auto merged storage/heap/ha_heap.h: Auto merged storage/heap/heapdef.h: Auto merged storage/heap/hp_block.c: Auto merged storage/heap/hp_clear.c: Auto merged storage/heap/hp_close.c: Auto merged storage/heap/hp_create.c: Auto merged storage/heap/hp_delete.c: Auto merged storage/heap/hp_extra.c: Auto merged storage/heap/hp_hash.c: Auto merged storage/heap/hp_info.c: Auto merged storage/heap/hp_open.c: Auto merged storage/heap/hp_panic.c: Auto merged storage/heap/hp_rename.c: Auto merged storage/heap/hp_rfirst.c: Auto merged storage/heap/hp_rkey.c: Auto merged storage/heap/hp_rlast.c: Auto merged storage/heap/hp_rnext.c: Auto merged storage/heap/hp_rprev.c: Auto merged storage/heap/hp_rrnd.c: Auto merged storage/heap/hp_rsame.c: Auto merged storage/heap/hp_scan.c: Auto merged storage/heap/hp_static.c: Auto merged storage/heap/hp_test1.c: Auto merged storage/heap/hp_test2.c: Auto merged storage/heap/hp_update.c: Auto merged storage/heap/hp_write.c: Auto merged storage/innobase/Makefile.am: Auto merged storage/innobase/btr/Makefile.am: Auto merged storage/innobase/buf/Makefile.am: Auto merged storage/innobase/data/Makefile.am: Auto merged storage/innobase/dict/Makefile.am: Auto merged storage/innobase/dyn/Makefile.am: Auto merged storage/innobase/eval/Makefile.am: Auto merged storage/innobase/fil/Makefile.am: Auto merged storage/innobase/fsp/Makefile.am: Auto merged storage/innobase/fut/Makefile.am: Auto merged storage/innobase/ha/Makefile.am: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged storage/innobase/handler/ha_innodb.h: Auto merged storage/innobase/ibuf/Makefile.am: Auto merged storage/innobase/lock/Makefile.am: Auto merged storage/innobase/log/Makefile.am: Auto merged storage/innobase/mach/Makefile.am: Auto merged storage/innobase/mem/Makefile.am: Auto merged storage/innobase/mtr/Makefile.am: Auto merged storage/innobase/os/Makefile.am: Auto merged storage/innobase/page/Makefile.am: Auto merged storage/innobase/pars/Makefile.am: Auto merged storage/innobase/que/Makefile.am: Auto merged storage/innobase/read/Makefile.am: Auto merged storage/innobase/rem/Makefile.am: Auto merged storage/innobase/row/Makefile.am: Auto merged storage/innobase/srv/Makefile.am: Auto merged storage/innobase/sync/Makefile.am: Auto merged storage/innobase/thr/Makefile.am: Auto merged storage/innobase/trx/Makefile.am: Auto merged storage/innobase/usr/Makefile.am: Auto merged storage/innobase/ut/Makefile.am: Auto merged storage/myisam/Makefile.am: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ft_eval.c: Auto merged storage/myisam/ft_eval.h: Auto merged storage/myisam/ft_nlq_search.c: Auto merged storage/myisam/ft_parser.c: Auto merged storage/myisam/ft_static.c: Auto merged storage/myisam/ft_stem.c: Auto merged storage/myisam/ft_stopwords.c: Auto merged storage/myisam/ft_test1.c: Auto merged storage/myisam/ft_test1.h: Auto merged storage/myisam/ft_update.c: Auto merged storage/myisam/ftdefs.h: Auto merged storage/myisam/fulltext.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/ha_myisam.h: Auto merged storage/myisam/mi_cache.c: Auto merged storage/myisam/mi_changed.c: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_checksum.c: Auto merged storage/myisam/mi_close.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_dbug.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/mi_delete_all.c: Auto merged storage/myisam/mi_delete_table.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_extra.c: Auto merged storage/myisam/mi_info.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_keycache.c: Auto merged storage/myisam/mi_locking.c: Auto merged storage/myisam/mi_log.c: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisam/mi_packrec.c: Auto merged storage/myisam/mi_page.c: Auto merged storage/myisam/mi_panic.c: Auto merged storage/myisam/mi_preload.c: Auto merged storage/myisam/mi_range.c: Auto merged storage/myisam/mi_rename.c: Auto merged storage/myisam/mi_rfirst.c: Auto merged storage/myisam/mi_rkey.c: Auto merged storage/myisam/mi_rlast.c: Auto merged storage/myisam/mi_rnext.c: Auto merged storage/myisam/mi_rnext_same.c: Auto merged storage/myisam/mi_rprev.c: Auto merged storage/myisam/mi_rrnd.c: Auto merged storage/myisam/mi_rsame.c: Auto merged storage/myisam/mi_rsamepos.c: Auto merged storage/myisam/mi_scan.c: Auto merged storage/myisam/mi_search.c: Auto merged storage/myisam/mi_static.c: Auto merged storage/myisam/mi_statrec.c: Auto merged storage/myisam/mi_test1.c: Auto merged storage/myisam/mi_test2.c: Auto merged storage/myisam/mi_test3.c: Auto merged storage/myisam/mi_unique.c: Auto merged storage/myisam/mi_update.c: Auto merged storage/myisam/mi_write.c: Auto merged storage/myisam/myisam_ftdump.c: Auto merged storage/myisam/myisamchk.c: Auto merged storage/myisam/myisamdef.h: Auto merged storage/myisam/myisamlog.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/rt_index.c: Auto merged storage/myisam/rt_index.h: Auto merged storage/myisam/rt_key.c: Auto merged storage/myisam/rt_key.h: Auto merged storage/myisam/rt_mbr.c: Auto merged storage/myisam/rt_mbr.h: Auto merged storage/myisam/rt_split.c: Auto merged storage/myisam/rt_test.c: Auto merged storage/myisam/sort.c: Auto merged storage/myisam/sp_defs.h: Auto merged storage/myisam/sp_key.c: Auto merged storage/myisam/sp_test.c: Auto merged storage/myisammrg/Makefile.am: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/myisammrg/ha_myisammrg.h: Auto merged storage/myisammrg/myrg_close.c: Auto merged storage/myisammrg/myrg_create.c: Auto merged storage/myisammrg/myrg_def.h: Auto merged storage/myisammrg/myrg_delete.c: Auto merged storage/myisammrg/myrg_extra.c: Auto merged storage/myisammrg/myrg_info.c: Auto merged storage/myisammrg/myrg_locking.c: Auto merged storage/myisammrg/myrg_open.c: Auto merged storage/myisammrg/myrg_panic.c: Auto merged storage/myisammrg/myrg_queue.c: Auto merged storage/myisammrg/myrg_range.c: Auto merged storage/myisammrg/myrg_rfirst.c: Auto merged storage/myisammrg/myrg_rkey.c: Auto merged storage/myisammrg/myrg_rlast.c: Auto merged storage/myisammrg/myrg_rnext.c: Auto merged storage/myisammrg/myrg_rnext_same.c: Auto merged storage/myisammrg/myrg_rprev.c: Auto merged storage/myisammrg/myrg_rrnd.c: Auto merged storage/myisammrg/myrg_rsame.c: Auto merged storage/myisammrg/myrg_static.c: Auto merged storage/myisammrg/myrg_update.c: Auto merged storage/myisammrg/myrg_write.c: Auto merged storage/ndb/include/debugger/DebuggerNames.hpp: Auto merged storage/ndb/include/debugger/EventLogger.hpp: Auto merged storage/ndb/include/debugger/GrepError.hpp: Auto merged storage/ndb/include/debugger/SignalLoggerManager.hpp: Auto merged storage/ndb/include/ndb_constants.h: Auto merged storage/ndb/include/ndb_global.h.in: Auto merged storage/ndb/include/ndb_init.h: Auto merged storage/ndb/include/ndb_types.h.in: Auto merged storage/ndb/include/ndb_version.h.in: Auto merged storage/ndb/include/editline/editline.h: Auto merged storage/ndb/include/kernel/AttributeDescriptor.hpp: Auto merged storage/ndb/include/kernel/AttributeHeader.hpp: Auto merged storage/ndb/include/kernel/AttributeList.hpp: Auto merged storage/ndb/include/kernel/BlockNumbers.h: Auto merged storage/ndb/include/kernel/GlobalSignalNumbers.h: Auto merged storage/ndb/include/kernel/GrepEvent.hpp: Auto merged storage/ndb/include/kernel/Interpreter.hpp: Auto merged storage/ndb/include/kernel/LogLevel.hpp: Auto merged storage/ndb/include/kernel/NodeBitmask.hpp: Auto merged storage/ndb/include/kernel/NodeInfo.hpp: Auto merged storage/ndb/include/kernel/NodeState.hpp: Auto merged storage/ndb/include/kernel/RefConvert.hpp: Auto merged storage/ndb/include/kernel/kernel_types.h: Auto merged storage/ndb/include/kernel/ndb_limits.h: Auto merged storage/ndb/include/kernel/signaldata/AbortAll.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccScan.hpp: Auto merged storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/AlterTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/ApiVersion.hpp: Auto merged storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/AttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/BackupSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/BuildIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp: Auto merged storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CmInit.hpp: Auto merged storage/ndb/include/kernel/trigger_definitions.h: Auto merged storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ConfigParamId.hpp: Auto merged storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyActive.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateEvnt.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/CreateTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/DiAddTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DiGetNodes.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictStart.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictTabInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihAddFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihStartTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp: Auto merged storage/ndb/include/kernel/signaldata/DisconnectRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTabFile.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTrig.hpp: Auto merged storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/EmptyLcp.hpp: Auto merged storage/ndb/include/kernel/signaldata/EndTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/EventReport.hpp: Auto merged storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ExecFragReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FailRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsAppendReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsCloseReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsOpenReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/GCPSave.hpp: Auto merged storage/ndb/include/kernel/signaldata/GetTabInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/GetTableId.hpp: Auto merged storage/ndb/include/kernel/signaldata/GrepImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/HotSpareRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/KeyInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/LCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/ListTables.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhKey.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/LqhTransConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/ManagementServer.hpp: Auto merged storage/ndb/include/kernel/signaldata/MasterGCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/MasterLCP.hpp: Auto merged storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/NdbSttor.hpp: Auto merged storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/NextScan.hpp: Auto merged storage/ndb/include/kernel/signaldata/NodeFailRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/PackedSignal.hpp: Auto merged storage/ndb/include/kernel/signaldata/PrepDropTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/RelTabMem.hpp: Auto merged storage/ndb/include/kernel/signaldata/RepImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/ResumeReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/ScanFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/ScanTab.hpp: Auto merged storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/SetVarReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalData.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp: Auto merged storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/SrFragidConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartFragReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartMe.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartPerm.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartRec.hpp: Auto merged storage/ndb/include/kernel/signaldata/StartTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopMe.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopPerm.hpp: Auto merged storage/ndb/include/kernel/signaldata/StopReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/SumaImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/SystemError.hpp: Auto merged storage/ndb/include/kernel/signaldata/TamperOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcCommit.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcHbRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcKeyReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TestOrd.hpp: Auto merged storage/ndb/include/kernel/signaldata/TransIdAI.hpp: Auto merged storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupCommit.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupFrag.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupKey.hpp: Auto merged storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxBound.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxContinueB.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxMaint.hpp: Auto merged storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp: Auto merged storage/ndb/include/kernel/signaldata/UpdateTo.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilDelete.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilExecute.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilLock.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilPrepare.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilRelease.hpp: Auto merged storage/ndb/include/kernel/signaldata/UtilSequence.hpp: Auto merged storage/ndb/include/kernel/signaldata/WaitGCP.hpp: Auto merged storage/ndb/include/logger/ConsoleLogHandler.hpp: Auto merged storage/ndb/include/logger/FileLogHandler.hpp: Auto merged storage/ndb/include/logger/LogHandler.hpp: Auto merged storage/ndb/include/logger/Logger.hpp: Auto merged storage/ndb/include/logger/SysLogHandler.hpp: Auto merged storage/ndb/include/mgmapi/mgmapi.h: Auto merged storage/ndb/include/mgmapi/mgmapi_debug.h: Auto merged storage/ndb/include/mgmapi/ndb_logevent.h: Auto merged storage/ndb/include/mgmapi/ndbd_exit_codes.h: Auto merged storage/ndb/include/mgmcommon/ConfigRetriever.hpp: Auto merged storage/ndb/include/mgmcommon/IPCConfig.hpp: Auto merged storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp: Auto merged storage/ndb/include/ndbapi/Ndb.hpp: Auto merged storage/ndb/include/ndbapi/NdbApi.hpp: Auto merged storage/ndb/include/ndbapi/NdbBlob.hpp: Auto merged storage/ndb/include/ndbapi/NdbDictionary.hpp: Auto merged storage/ndb/include/ndbapi/NdbError.hpp: Auto merged storage/ndb/include/ndbapi/NdbEventOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbIndexOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbPool.hpp: Auto merged storage/ndb/include/ndbapi/NdbRecAttr.hpp: Auto merged storage/ndb/include/ndbapi/NdbReceiver.hpp: Auto merged storage/ndb/include/ndbapi/NdbScanFilter.hpp: Auto merged storage/ndb/include/ndbapi/NdbScanOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbTransaction.hpp: Auto merged storage/ndb/include/ndbapi/ndb_cluster_connection.hpp: Auto merged storage/ndb/include/ndbapi/ndb_opt_defaults.h: Auto merged storage/ndb/include/ndbapi/ndbapi_limits.h: Auto merged storage/ndb/include/ndbapi/ndberror.h: Auto merged storage/ndb/include/newtonapi/dba.h: Auto merged storage/ndb/include/newtonapi/defs/pcn_types.h: Auto merged storage/ndb/include/portlib/NdbCondition.h: Auto merged storage/ndb/include/portlib/NdbConfig.h: Auto merged storage/ndb/include/portlib/NdbDaemon.h: Auto merged storage/ndb/include/portlib/NdbEnv.h: Auto merged storage/ndb/include/portlib/NdbHost.h: Auto merged storage/ndb/include/portlib/NdbMain.h: Auto merged storage/ndb/include/portlib/NdbMem.h: Auto merged storage/ndb/include/portlib/NdbMutex.h: Auto merged storage/ndb/include/portlib/NdbSleep.h: Auto merged storage/ndb/include/portlib/NdbTCP.h: Auto merged storage/ndb/include/portlib/NdbThread.h: Auto merged storage/ndb/include/portlib/NdbTick.h: Auto merged storage/ndb/include/portlib/PortDefs.h: Auto merged storage/ndb/include/portlib/prefetch.h: Auto merged storage/ndb/include/transporter/TransporterCallback.hpp: Auto merged storage/ndb/include/transporter/TransporterDefinitions.hpp: Auto merged storage/ndb/include/transporter/TransporterRegistry.hpp: Auto merged storage/ndb/include/util/BaseString.hpp: Auto merged storage/ndb/include/util/Bitmask.hpp: Auto merged storage/ndb/include/util/File.hpp: Auto merged storage/ndb/include/util/InputStream.hpp: Auto merged storage/ndb/include/util/NdbAutoPtr.hpp: Auto merged storage/ndb/include/util/NdbOut.hpp: Auto merged storage/ndb/include/util/NdbSqlUtil.hpp: Auto merged storage/ndb/include/util/OutputStream.hpp: Auto merged storage/ndb/include/util/Parser.hpp: Auto merged storage/ndb/include/util/Properties.hpp: Auto merged storage/ndb/include/util/SimpleProperties.hpp: Auto merged storage/ndb/include/util/SocketAuthenticator.hpp: Auto merged storage/ndb/include/util/SocketClient.hpp: Auto merged storage/ndb/include/util/SocketServer.hpp: Auto merged storage/ndb/include/util/UtilBuffer.hpp: Auto merged storage/ndb/include/util/Vector.hpp: Auto merged storage/ndb/include/util/basestring_vsnprintf.h: Auto merged storage/ndb/include/util/md5_hash.hpp: Auto merged storage/ndb/include/util/ndb_opts.h: Auto merged storage/ndb/include/util/random.h: Auto merged storage/ndb/include/util/socket_io.h: Auto merged storage/ndb/include/util/uucode.h: Auto merged storage/ndb/include/util/version.h: Auto merged storage/ndb/src/common/debugger/BlockNames.cpp: Auto merged storage/ndb/src/common/debugger/DebuggerNames.cpp: Auto merged storage/ndb/src/common/debugger/EventLogger.cpp: Auto merged storage/ndb/src/common/debugger/GrepError.cpp: Auto merged storage/ndb/src/common/debugger/SignalLoggerManager.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AccLock.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTable.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/DropTrig.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FailRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/GCPSave.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LCP.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhKey.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/ScanTab.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SignalNames.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/StartRec.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/SystemError.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcIndx.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TupCommit.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TupKey.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilLock.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp: Auto merged storage/ndb/src/common/logger/ConsoleLogHandler.cpp: Auto merged storage/ndb/src/common/logger/FileLogHandler.cpp: Auto merged storage/ndb/src/common/logger/LogHandler.cpp: Auto merged storage/ndb/src/common/logger/LogHandlerList.cpp: Auto merged storage/ndb/src/common/logger/LogHandlerList.hpp: Auto merged storage/ndb/src/common/logger/Logger.cpp: Auto merged storage/ndb/src/common/logger/SysLogHandler.cpp: Auto merged storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp: Auto merged storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp: Auto merged storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp: Auto merged storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp: Auto merged storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged storage/ndb/src/common/mgmcommon/IPCConfig.cpp: Auto merged storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp: Auto merged storage/ndb/src/common/portlib/NdbCondition.c: Auto merged storage/ndb/src/common/portlib/NdbConfig.c: Auto merged storage/ndb/src/common/portlib/NdbDaemon.c: Auto merged storage/ndb/src/common/portlib/NdbEnv.c: Auto merged storage/ndb/src/common/portlib/NdbHost.c: Auto merged storage/ndb/src/common/portlib/NdbMem.c: Auto merged storage/ndb/src/common/portlib/NdbMutex.c: Auto merged storage/ndb/src/common/portlib/NdbPortLibTest.cpp: Auto merged storage/ndb/src/common/portlib/NdbSleep.c: Auto merged storage/ndb/src/common/portlib/NdbTCP.cpp: Auto merged storage/ndb/src/common/portlib/NdbThread.c: Auto merged storage/ndb/src/common/portlib/NdbTick.c: Auto merged storage/ndb/src/common/portlib/memtest.c: Auto merged storage/ndb/src/common/portlib/mmstest.cpp: Auto merged storage/ndb/src/common/portlib/munmaptest.cpp: Auto merged storage/ndb/src/common/portlib/win32/NdbCondition.c: Auto merged storage/ndb/src/common/portlib/win32/NdbDaemon.c: Auto merged storage/ndb/src/common/portlib/win32/NdbEnv.c: Auto merged storage/ndb/src/common/portlib/win32/NdbHost.c: Auto merged storage/ndb/src/common/portlib/win32/NdbMem.c: Auto merged storage/ndb/src/common/portlib/win32/NdbMutex.c: Auto merged storage/ndb/src/common/portlib/win32/NdbSleep.c: Auto merged storage/ndb/src/common/portlib/win32/NdbTCP.c: Auto merged storage/ndb/src/common/portlib/win32/NdbThread.c: Auto merged storage/ndb/src/common/portlib/win32/NdbTick.c: Auto merged storage/ndb/src/common/transporter/Packer.cpp: Auto merged storage/ndb/src/common/transporter/Packer.hpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SCI_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Buffer.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp: Auto merged storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp: Auto merged storage/ndb/src/common/transporter/SendBuffer.cpp: Auto merged storage/ndb/src/common/transporter/SendBuffer.hpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.cpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/Transporter.cpp: Auto merged storage/ndb/src/common/transporter/Transporter.hpp: Auto merged storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp: Auto merged storage/ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/buddy.cpp: Auto merged storage/ndb/src/common/transporter/buddy.hpp: Auto merged storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp: Auto merged storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp: Auto merged storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp: Auto merged storage/ndb/src/common/util/BaseString.cpp: Auto merged storage/ndb/src/common/util/File.cpp: Auto merged storage/ndb/src/common/util/InputStream.cpp: Auto merged storage/ndb/src/common/util/NdbOut.cpp: Auto merged storage/ndb/src/common/util/NdbSqlUtil.cpp: Auto merged storage/ndb/src/common/util/OutputStream.cpp: Auto merged storage/ndb/src/common/util/Parser.cpp: Auto merged storage/ndb/src/common/util/Properties.cpp: Auto merged storage/ndb/src/common/util/SimpleProperties.cpp: Auto merged storage/ndb/src/common/util/SocketAuthenticator.cpp: Auto merged storage/ndb/src/common/util/SocketClient.cpp: Auto merged storage/ndb/src/common/util/SocketServer.cpp: Auto merged storage/ndb/src/common/util/basestring_vsnprintf.c: Auto merged storage/ndb/src/common/util/md5_hash.cpp: Auto merged storage/ndb/src/common/util/ndb_init.c: Auto merged storage/ndb/src/common/util/random.c: Auto merged storage/ndb/src/common/util/socket_io.cpp: Auto merged storage/ndb/src/common/util/strdup.c: Auto merged storage/ndb/src/common/util/filetest/FileUnitTest.cpp: Auto merged storage/ndb/src/common/util/filetest/FileUnitTest.hpp: Auto merged storage/ndb/src/common/util/testProperties/testProperties.cpp: Auto merged storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp: Auto merged storage/ndb/src/common/util/uucode.c: Auto merged storage/ndb/src/common/util/version.c: Auto merged storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp: Auto merged storage/ndb/src/cw/cpcc-win32/C++/TreeView.h: Auto merged storage/ndb/src/cw/cpcc-win32/C++/resource.h: Auto merged storage/ndb/src/cw/cpcd/APIService.cpp: Auto merged storage/ndb/src/cw/cpcd/APIService.hpp: Auto merged storage/ndb/src/cw/cpcd/CPCD.cpp: Auto merged storage/ndb/src/cw/cpcd/CPCD.hpp: Auto merged storage/ndb/src/cw/cpcd/Monitor.cpp: Auto merged storage/ndb/src/cw/cpcd/Process.cpp: Auto merged storage/ndb/src/cw/cpcd/common.cpp: Auto merged storage/ndb/src/cw/cpcd/common.hpp: Auto merged storage/ndb/src/cw/cpcd/main.cpp: Auto merged storage/ndb/src/cw/test/socketclient/socketClientTest.cpp: Auto merged storage/ndb/src/cw/util/ClientInterface.cpp: Auto merged storage/ndb/src/cw/util/ClientInterface.hpp: Auto merged storage/ndb/src/cw/util/SocketRegistry.cpp: Auto merged storage/ndb/src/cw/util/SocketRegistry.hpp: Auto merged storage/ndb/src/cw/util/SocketService.cpp: Auto merged storage/ndb/src/cw/util/SocketService.hpp: Auto merged storage/ndb/src/kernel/SimBlockList.cpp: Auto merged storage/ndb/src/kernel/blocks/mutexes.hpp: Auto merged storage/ndb/src/kernel/main.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/BackupInit.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/read.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp: Auto merged storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp: Auto merged storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/timer.hpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.hpp: Auto merged storage/ndb/src/kernel/blocks/suma/SumaInit.cpp: Auto merged storage/ndb/src/kernel/blocks/trix/Trix.cpp: Auto merged storage/ndb/src/kernel/blocks/trix/Trix.hpp: Auto merged storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.cpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.hpp: Auto merged storage/ndb/src/kernel/error/TimeModule.cpp: Auto merged storage/ndb/src/kernel/error/TimeModule.hpp: Auto merged storage/ndb/src/kernel/error/ndbd_exit_codes.c: Auto merged storage/ndb/src/kernel/vm/Array.hpp: Auto merged storage/ndb/src/kernel/vm/ArrayPool.hpp: Auto merged storage/ndb/src/kernel/vm/CArray.hpp: Auto merged storage/ndb/src/kernel/vm/Callback.hpp: Auto merged storage/ndb/src/kernel/vm/ClusterConfiguration.cpp: Auto merged storage/ndb/src/kernel/vm/ClusterConfiguration.hpp: Auto merged storage/ndb/src/kernel/vm/Configuration.cpp: Auto merged storage/ndb/src/kernel/vm/Configuration.hpp: Auto merged storage/ndb/src/kernel/vm/DLFifoList.hpp: Auto merged storage/ndb/src/kernel/vm/DLHashTable.hpp: Auto merged storage/ndb/src/kernel/vm/DLHashTable2.hpp: Auto merged storage/ndb/src/kernel/vm/DLList.hpp: Auto merged storage/ndb/src/kernel/vm/DataBuffer.hpp: Auto merged storage/ndb/src/kernel/vm/Emulator.cpp: Auto merged storage/ndb/src/kernel/vm/Emulator.hpp: Auto merged storage/ndb/src/kernel/vm/FastScheduler.cpp: Auto merged storage/ndb/src/kernel/vm/FastScheduler.hpp: Auto merged storage/ndb/src/kernel/vm/GlobalData.hpp: Auto merged storage/ndb/src/kernel/vm/KeyDescriptor.hpp: Auto merged storage/ndb/src/kernel/vm/KeyTable.hpp: Auto merged storage/ndb/src/kernel/vm/KeyTable2.hpp: Auto merged storage/ndb/src/kernel/vm/LongSignal.hpp: Auto merged storage/ndb/src/kernel/vm/Mutex.cpp: Auto merged storage/ndb/src/kernel/vm/Mutex.hpp: Auto merged storage/ndb/src/kernel/vm/Prio.hpp: Auto merged storage/ndb/src/kernel/vm/RequestTracker.hpp: Auto merged storage/ndb/src/kernel/vm/SLList.hpp: Auto merged storage/ndb/src/kernel/vm/SafeCounter.cpp: Auto merged storage/ndb/src/kernel/vm/SafeCounter.hpp: Auto merged storage/ndb/src/kernel/vm/SectionReader.cpp: Auto merged storage/ndb/src/kernel/vm/SectionReader.hpp: Auto merged storage/ndb/src/kernel/vm/SignalCounter.hpp: Auto merged storage/ndb/src/kernel/vm/SimBlockList.hpp: Auto merged storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.hpp: Auto merged storage/ndb/src/kernel/vm/SuperPool.cpp: Auto merged storage/ndb/src/kernel/vm/SuperPool.hpp: Auto merged storage/ndb/src/kernel/vm/ThreadConfig.cpp: Auto merged storage/ndb/src/kernel/vm/ThreadConfig.hpp: Auto merged storage/ndb/src/kernel/vm/TimeQueue.cpp: Auto merged storage/ndb/src/kernel/vm/TimeQueue.hpp: Auto merged storage/ndb/src/kernel/vm/TransporterCallback.cpp: Auto merged storage/ndb/src/kernel/vm/VMSignal.cpp: Auto merged storage/ndb/src/kernel/vm/VMSignal.hpp: Auto merged storage/ndb/src/kernel/vm/WaitQueue.hpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.cpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.hpp: Auto merged storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp: Auto merged storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp: Auto merged storage/ndb/src/kernel/vm/al_test/main.cpp: Auto merged storage/ndb/src/kernel/vm/ndbd_malloc.cpp: Auto merged storage/ndb/src/kernel/vm/ndbd_malloc.hpp: Auto merged storage/ndb/src/kernel/vm/pc.hpp: Auto merged storage/ndb/src/kernel/vm/testCopy/rr.cpp: Auto merged storage/ndb/src/kernel/vm/testCopy/testCopy.cpp: Auto merged storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp: Auto merged storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp: Auto merged storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp: Auto merged storage/ndb/src/kernel/vm/testSuperPool.cpp: Auto merged storage/ndb/src/mgmapi/LocalConfig.cpp: Auto merged storage/ndb/src/mgmapi/LocalConfig.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi_configuration.hpp: Auto merged storage/ndb/src/mgmapi/mgmapi_internal.h: Auto merged storage/ndb/src/mgmapi/ndb_logevent.cpp: Auto merged storage/ndb/src/mgmapi/ndb_logevent.hpp: Auto merged storage/ndb/src/mgmapi/test/keso.c: Auto merged storage/ndb/src/mgmapi/test/mgmSrvApi.cpp: Auto merged storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged storage/ndb/src/mgmclient/main.cpp: Auto merged storage/ndb/src/mgmclient/ndb_mgmclient.hpp: Auto merged storage/ndb/src/mgmclient/ndb_mgmclient.h: Auto merged storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp: Auto merged storage/ndb/src/mgmsrv/Config.cpp: Auto merged storage/ndb/src/mgmsrv/Config.hpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.hpp: Auto merged storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged storage/ndb/src/mgmsrv/InitConfigFileParser.hpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/mgmsrv/Services.hpp: Auto merged storage/ndb/src/mgmsrv/SignalQueue.cpp: Auto merged storage/ndb/src/mgmsrv/SignalQueue.hpp: Auto merged storage/ndb/src/mgmsrv/convertStrToInt.cpp: Auto merged storage/ndb/src/mgmsrv/convertStrToInt.hpp: Auto merged storage/ndb/src/mgmsrv/main.cpp: Auto merged storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp: Auto merged storage/ndb/src/ndbapi/API.hpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.cpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.hpp: Auto merged storage/ndb/src/ndbapi/DictCache.cpp: Auto merged storage/ndb/src/ndbapi/DictCache.hpp: Auto merged storage/ndb/src/ndbapi/Ndb.cpp: Auto merged storage/ndb/src/ndbapi/NdbApiSignal.cpp: Auto merged storage/ndb/src/ndbapi/NdbApiSignal.hpp: Auto merged storage/ndb/src/ndbapi/NdbBlob.cpp: Auto merged storage/ndb/src/ndbapi/NdbBlobImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbDictionary.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbErrorOut.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbIndexOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbLinHash.hpp: Auto merged storage/ndb/src/ndbapi/NdbOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationExec.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationInt.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationScan.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationSearch.cpp: Auto merged storage/ndb/src/ndbapi/NdbPool.cpp: Auto merged storage/ndb/src/ndbapi/NdbPoolImpl.cpp: Auto merged storage/ndb/src/ndbapi/NdbPoolImpl.hpp: Auto merged storage/ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged storage/ndb/src/ndbapi/NdbReceiver.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanFilter.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransactionScan.cpp: Auto merged storage/ndb/src/ndbapi/NdbUtil.cpp: Auto merged storage/ndb/src/ndbapi/NdbUtil.hpp: Auto merged storage/ndb/src/ndbapi/NdbWaiter.hpp: Auto merged storage/ndb/src/ndbapi/Ndberr.cpp: Auto merged storage/ndb/src/ndbapi/Ndbif.cpp: Auto merged storage/ndb/src/ndbapi/Ndbinit.cpp: Auto merged storage/ndb/src/ndbapi/Ndblist.cpp: Auto merged storage/ndb/src/ndbapi/ObjectMap.hpp: Auto merged storage/ndb/src/ndbapi/SignalSender.cpp: Auto merged storage/ndb/src/ndbapi/SignalSender.hpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.cpp: Auto merged storage/ndb/src/ndbapi/TransporterFacade.hpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp: Auto merged storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp: Auto merged storage/ndb/test/include/CpcClient.hpp: Auto merged storage/ndb/test/include/HugoAsynchTransactions.hpp: Auto merged storage/ndb/test/include/HugoCalculator.hpp: Auto merged storage/ndb/test/include/HugoOperations.hpp: Auto merged storage/ndb/test/include/HugoTransactions.hpp: Auto merged storage/ndb/test/include/NDBT.hpp: Auto merged storage/ndb/test/include/NDBT_DataSet.hpp: Auto merged storage/ndb/test/include/NDBT_DataSetTransaction.hpp: Auto merged storage/ndb/test/include/NDBT_Error.hpp: Auto merged storage/ndb/test/include/NDBT_Output.hpp: Auto merged storage/ndb/test/include/NDBT_ResultRow.hpp: Auto merged storage/ndb/test/include/NDBT_ReturnCodes.h: Auto merged storage/ndb/test/include/NDBT_Stats.hpp: Auto merged storage/ndb/test/include/NDBT_Table.hpp: Auto merged storage/ndb/test/include/NDBT_Tables.hpp: Auto merged storage/ndb/test/include/NDBT_Test.hpp: Auto merged storage/ndb/test/include/NdbBackup.hpp: Auto merged storage/ndb/test/include/NdbConfig.hpp: Auto merged storage/ndb/test/include/NdbGrep.hpp: Auto merged storage/ndb/test/include/NdbRestarter.hpp: Auto merged storage/ndb/test/include/NdbRestarts.hpp: Auto merged storage/ndb/test/include/NdbSchemaCon.hpp: Auto merged storage/ndb/test/include/NdbSchemaOp.hpp: Auto merged storage/ndb/test/include/NdbTest.hpp: Auto merged storage/ndb/test/include/NdbTimer.hpp: Auto merged storage/ndb/test/include/TestNdbEventOperation.hpp: Auto merged storage/ndb/test/include/UtilTransactions.hpp: Auto merged storage/ndb/test/include/getarg.h: Auto merged storage/ndb/test/ndbapi/InsertRecs.cpp: Auto merged storage/ndb/test/ndbapi/ScanFilter.hpp: Auto merged storage/ndb/test/ndbapi/ScanFunctions.hpp: Auto merged storage/ndb/test/ndbapi/ScanInterpretTest.hpp: Auto merged storage/ndb/test/ndbapi/TraceNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/VerifyNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/acid.cpp: Auto merged storage/ndb/test/ndbapi/acid2.cpp: Auto merged storage/ndb/test/ndbapi/adoInsertRecs.cpp: Auto merged storage/ndb/test/ndbapi/asyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/benchronja.cpp: Auto merged storage/ndb/test/ndbapi/bulk_copy.cpp: Auto merged storage/ndb/test/ndbapi/cdrserver.cpp: Auto merged storage/ndb/test/ndbapi/celloDb.cpp: Auto merged storage/ndb/test/ndbapi/create_all_tabs.cpp: Auto merged storage/ndb/test/ndbapi/create_tab.cpp: Auto merged storage/ndb/test/ndbapi/drop_all_tabs.cpp: Auto merged storage/ndb/test/ndbapi/flexAsynch.cpp: Auto merged storage/ndb/test/ndbapi/flexBench.cpp: Auto merged storage/ndb/test/ndbapi/flexHammer.cpp: Auto merged storage/ndb/test/ndbapi/flexScan.cpp: Auto merged storage/ndb/test/ndbapi/flexTT.cpp: Auto merged storage/ndb/test/ndbapi/flexTimedAsynch.cpp: Auto merged storage/ndb/test/ndbapi/flex_bench_mysql.cpp: Auto merged storage/ndb/test/ndbapi/index.cpp: Auto merged storage/ndb/test/ndbapi/index2.cpp: Auto merged storage/ndb/test/ndbapi/initronja.cpp: Auto merged storage/ndb/test/ndbapi/interpreterInTup.cpp: Auto merged storage/ndb/test/ndbapi/mainAsyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/msa.cpp: Auto merged storage/ndb/test/ndbapi/ndb_async1.cpp: Auto merged storage/ndb/test/ndbapi/ndb_async2.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_populate.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction2.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction3.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction4.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction5.cpp: Auto merged storage/ndb/test/ndbapi/ndb_user_transaction6.cpp: Auto merged storage/ndb/test/ndbapi/restarter.cpp: Auto merged storage/ndb/test/ndbapi/restarter2.cpp: Auto merged storage/ndb/test/ndbapi/restarts.cpp: Auto merged storage/ndb/test/ndbapi/size.cpp: Auto merged storage/ndb/test/ndbapi/testBackup.cpp: Auto merged storage/ndb/test/ndbapi/testBasic.cpp: Auto merged storage/ndb/test/ndbapi/testBasicAsynch.cpp: Auto merged storage/ndb/test/ndbapi/testBlobs.cpp: Auto merged storage/ndb/test/ndbapi/testDataBuffers.cpp: Auto merged storage/ndb/test/ndbapi/testDeadlock.cpp: Auto merged storage/ndb/test/ndbapi/testDict.cpp: Auto merged storage/ndb/test/ndbapi/testGrepVerify.cpp: Auto merged storage/ndb/test/ndbapi/testIndex.cpp: Auto merged storage/ndb/test/ndbapi/testInterpreter.cpp: Auto merged storage/ndb/test/ndbapi/testMgm.cpp: Auto merged storage/ndb/test/ndbapi/testNdbApi.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: Auto merged storage/ndb/test/ndbapi/testOIBasic.cpp: Auto merged storage/ndb/test/ndbapi/testOperations.cpp: Auto merged storage/ndb/test/ndbapi/testOrderedIndex.cpp: Auto merged storage/ndb/test/ndbapi/testPartitioning.cpp: Auto merged storage/ndb/test/ndbapi/testReadPerf.cpp: Auto merged storage/ndb/test/ndbapi/bank/Bank.cpp: Auto merged storage/ndb/test/ndbapi/bank/Bank.hpp: Auto merged storage/ndb/test/ndbapi/bank/BankLoad.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankCreator.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankMakeGL.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankTimer.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp: Auto merged storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp: Auto merged storage/ndb/test/ndbapi/bank/testBank.cpp: Auto merged storage/ndb/test/ndbapi/bench/asyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/bench/dbGenerator.h: Auto merged storage/ndb/test/ndbapi/bench/dbPopulate.cpp: Auto merged storage/ndb/test/ndbapi/bench/dbPopulate.h: Auto merged storage/ndb/test/ndbapi/bench/macros.h: Auto merged storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp: Auto merged storage/ndb/test/ndbapi/bench/mainPopulate.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_async1.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_async2.cpp: Auto merged storage/ndb/test/ndbapi/testRestartGci.cpp: Auto merged storage/ndb/test/ndbapi/testSRBank.cpp: Auto merged storage/ndb/test/ndbapi/testScan.cpp: Auto merged storage/ndb/test/ndbapi/testScanInterpreter.cpp: Auto merged storage/ndb/test/ndbapi/testScanPerf.cpp: Auto merged storage/ndb/test/ndbapi/testSystemRestart.cpp: Auto merged storage/ndb/test/ndbapi/testTimeout.cpp: Auto merged storage/ndb/test/ndbapi/testTransactions.cpp: Auto merged storage/ndb/test/ndbapi/test_event.cpp: Auto merged storage/ndb/test/ndbapi/test_event_merge.cpp: Auto merged storage/ndb/test/ndbapi/test_event_multi_table.cpp: Auto merged storage/ndb/test/ndbapi/userInterface.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_error.hpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_schema.hpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp: Auto merged storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp: Auto merged storage/ndb/test/ndbapi/bench/testData.h: Auto merged storage/ndb/test/ndbapi/bench/testDefinitions.h: Auto merged storage/ndb/test/ndbapi/bench/userInterface.cpp: Auto merged storage/ndb/test/ndbapi/bench/userInterface.h: Auto merged storage/ndb/test/newtonapi/basic_test/basic/basic.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/common.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/common.hpp: Auto merged storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp: Auto merged storage/ndb/test/newtonapi/basic_test/too_basic.cpp: Auto merged storage/ndb/test/newtonapi/perf_test/perf.cpp: Auto merged storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp: Auto merged storage/ndb/test/odbc/SQL99_test/SQL99_test.h: Auto merged storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp: Auto merged storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp: Auto merged storage/ndb/test/odbc/client/SQLBindColTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLBindParameterTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCancelTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp: Auto merged storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp: Auto merged storage/ndb/test/odbc/client/SQLConnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLCopyDescTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDescribeColTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDisconnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLEndTranTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLErrorTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLExecDirectTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLExecuteTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFetchTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetInfoTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLParamDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLPrepareTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLPutDataTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLRowCountTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLTablesTest.cpp: Auto merged storage/ndb/test/odbc/client/SQLTransactTest.cpp: Auto merged storage/ndb/test/odbc/client/common.hpp: Auto merged storage/ndb/test/odbc/client/main.cpp: Auto merged storage/ndb/test/odbc/driver/testOdbcDriver.cpp: Auto merged storage/ndb/test/odbc/test_compiler/test_compiler.cpp: Auto merged storage/ndb/test/run-test/main.cpp: Auto merged storage/ndb/test/run-test/run-test.hpp: Auto merged storage/ndb/test/src/CpcClient.cpp: Auto merged storage/ndb/test/src/HugoAsynchTransactions.cpp: Auto merged storage/ndb/test/src/HugoCalculator.cpp: Auto merged storage/ndb/test/src/HugoOperations.cpp: Auto merged storage/ndb/test/src/HugoTransactions.cpp: Auto merged storage/ndb/test/src/NDBT_Error.cpp: Auto merged storage/ndb/test/src/NDBT_Output.cpp: Auto merged storage/ndb/test/src/NDBT_ResultRow.cpp: Auto merged storage/ndb/test/src/NDBT_ReturnCodes.cpp: Auto merged storage/ndb/test/src/NDBT_Table.cpp: Auto merged storage/ndb/test/src/NDBT_Tables.cpp: Auto merged storage/ndb/test/src/NDBT_Test.cpp: Auto merged storage/ndb/test/src/NdbBackup.cpp: Auto merged storage/ndb/test/src/NdbConfig.cpp: Auto merged storage/ndb/test/src/NdbGrep.cpp: Auto merged storage/ndb/test/src/NdbRestarter.cpp: Auto merged storage/ndb/test/src/NdbRestarts.cpp: Auto merged storage/ndb/test/src/NdbSchemaCon.cpp: Auto merged storage/ndb/test/src/NdbSchemaOp.cpp: Auto merged storage/ndb/test/src/UtilTransactions.cpp: Auto merged storage/ndb/test/tools/copy_tab.cpp: Auto merged storage/ndb/test/tools/cpcc.cpp: Auto merged storage/ndb/test/tools/create_index.cpp: Auto merged storage/ndb/test/tools/hugoCalculator.cpp: Auto merged storage/ndb/test/tools/hugoFill.cpp: Auto merged storage/ndb/test/tools/hugoLoad.cpp: Auto merged storage/ndb/test/tools/hugoLockRecords.cpp: Auto merged storage/ndb/test/tools/hugoPkDelete.cpp: Auto merged storage/ndb/test/tools/hugoPkRead.cpp: Auto merged storage/ndb/test/tools/hugoPkReadRecord.cpp: Auto merged storage/ndb/test/tools/hugoPkUpdate.cpp: Auto merged storage/ndb/test/tools/hugoScanRead.cpp: Auto merged storage/ndb/test/tools/hugoScanUpdate.cpp: Auto merged storage/ndb/test/tools/restart.cpp: Auto merged storage/ndb/test/tools/transproxy.cpp: Auto merged storage/ndb/test/tools/verify_index.cpp: Auto merged storage/ndb/tools/delete_all.cpp: Auto merged storage/ndb/tools/desc.cpp: Auto merged storage/ndb/tools/drop_index.cpp: Auto merged storage/ndb/tools/drop_tab.cpp: Auto merged storage/ndb/tools/listTables.cpp: Auto merged storage/ndb/tools/ndb_condig.cpp: Auto merged storage/ndb/tools/ndb_test_platform.cpp: Auto merged storage/ndb/tools/ndbsql.cpp: Auto merged storage/ndb/tools/restore/Restore.cpp: Auto merged storage/ndb/tools/restore/Restore.hpp: Auto merged storage/ndb/tools/restore/consumer.cpp: Auto merged storage/ndb/tools/restore/consumer.hpp: Auto merged storage/ndb/tools/restore/consumer_printer.cpp: Auto merged storage/ndb/tools/restore/consumer_printer.hpp: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged storage/ndb/tools/restore/consumer_restore.hpp: Auto merged storage/ndb/tools/restore/consumer_restorem.cpp: Auto merged storage/ndb/tools/restore/restore_main.cpp: Auto merged storage/ndb/tools/select_all.cpp: Auto merged storage/ndb/tools/select_count.cpp: Auto merged storage/ndb/tools/waiter.cpp: Auto merged strings/Makefile.am: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-cp932.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-eucjpms.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-mb.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-ujis.c: Auto merged strings/ctype-utf8.c: Auto merged strings/ctype-win1250ch.c: Auto merged strings/ctype.c: Auto merged strings/decimal.c: Auto merged strings/strxnmov.c: Auto merged strings/xml.c: Auto merged tests/Makefile.am: Auto merged tests/mysql_client_test.c: Auto merged vio/Makefile.am: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged vio/viossl.c: Auto merged vio/viosslfactories.c: Auto merged zlib/Makefile.am: Auto merged
1513 lines
46 KiB
C++
1513 lines
46 KiB
C++
/* Copyright (C) 2000-2003 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
|
/* compare and test functions */
|
|
|
|
#ifdef USE_PRAGMA_INTERFACE
|
|
#pragma interface /* gcc class implementation */
|
|
#endif
|
|
|
|
extern Item_result item_cmp_type(Item_result a,Item_result b);
|
|
class Item_bool_func2;
|
|
class Arg_comparator;
|
|
|
|
typedef int (Arg_comparator::*arg_cmp_func)();
|
|
|
|
typedef int (*Item_field_cmpfunc)(Item_field *f1, Item_field *f2, void *arg);
|
|
|
|
class Arg_comparator: public Sql_alloc
|
|
{
|
|
Item **a, **b;
|
|
arg_cmp_func func;
|
|
Item_bool_func2 *owner;
|
|
Arg_comparator *comparators; // used only for compare_row()
|
|
|
|
public:
|
|
DTCollation cmp_collation;
|
|
|
|
Arg_comparator() {};
|
|
Arg_comparator(Item **a1, Item **a2): a(a1), b(a2) {};
|
|
|
|
int set_compare_func(Item_bool_func2 *owner, Item_result type);
|
|
inline int set_compare_func(Item_bool_func2 *owner_arg)
|
|
{
|
|
return set_compare_func(owner_arg, item_cmp_type((*a)->result_type(),
|
|
(*b)->result_type()));
|
|
}
|
|
inline int set_cmp_func(Item_bool_func2 *owner_arg,
|
|
Item **a1, Item **a2,
|
|
Item_result type)
|
|
{
|
|
a= a1;
|
|
b= a2;
|
|
return set_compare_func(owner_arg, type);
|
|
}
|
|
inline int set_cmp_func(Item_bool_func2 *owner_arg,
|
|
Item **a1, Item **a2)
|
|
{
|
|
return set_cmp_func(owner_arg, a1, a2,
|
|
item_cmp_type((*a1)->result_type(),
|
|
(*a2)->result_type()));
|
|
}
|
|
inline int compare() { return (this->*func)(); }
|
|
|
|
int compare_string(); // compare args[0] & args[1]
|
|
int compare_binary_string(); // compare args[0] & args[1]
|
|
int compare_real(); // compare args[0] & args[1]
|
|
int compare_decimal(); // compare args[0] & args[1]
|
|
int compare_int_signed(); // compare args[0] & args[1]
|
|
int compare_int_signed_unsigned();
|
|
int compare_int_unsigned_signed();
|
|
int compare_int_unsigned();
|
|
int compare_row(); // compare args[0] & args[1]
|
|
int compare_e_string(); // compare args[0] & args[1]
|
|
int compare_e_binary_string(); // compare args[0] & args[1]
|
|
int compare_e_real(); // compare args[0] & args[1]
|
|
int compare_e_decimal(); // compare args[0] & args[1]
|
|
int compare_e_int(); // compare args[0] & args[1]
|
|
int compare_e_int_diff_signedness();
|
|
int compare_e_row(); // compare args[0] & args[1]
|
|
|
|
static arg_cmp_func comparator_matrix [5][2];
|
|
|
|
friend class Item_func;
|
|
};
|
|
|
|
class Item_bool_func :public Item_int_func
|
|
{
|
|
public:
|
|
Item_bool_func() :Item_int_func() {}
|
|
Item_bool_func(Item *a) :Item_int_func(a) {}
|
|
Item_bool_func(Item *a,Item *b) :Item_int_func(a,b) {}
|
|
Item_bool_func(THD *thd, Item_bool_func *item) :Item_int_func(thd, item) {}
|
|
bool is_bool_func() { return 1; }
|
|
void fix_length_and_dec() { decimals=0; max_length=1; }
|
|
uint decimal_precision() const { return 1; }
|
|
};
|
|
|
|
class Item_cache;
|
|
#define UNKNOWN ((my_bool)-1)
|
|
|
|
|
|
/*
|
|
Item_in_optimizer(left_expr, Item_in_subselect(...))
|
|
|
|
Item_in_optimizer is used to wrap an instance of Item_in_subselect. This
|
|
class does the following:
|
|
- Evaluate the left expression and store it in Item_cache_* object (to
|
|
avoid re-evaluating it many times during subquery execution)
|
|
- Shortcut the evaluation of "NULL IN (...)" to NULL in the cases where we
|
|
don't care if the result is NULL or FALSE.
|
|
|
|
NOTE
|
|
It is not quite clear why the above listed functionality should be
|
|
placed into a separate class called 'Item_in_optimizer'.
|
|
*/
|
|
|
|
class Item_in_optimizer: public Item_bool_func
|
|
{
|
|
protected:
|
|
Item_cache *cache;
|
|
bool save_cache;
|
|
/*
|
|
Stores the value of "NULL IN (SELECT ...)" for uncorrelated subqueries:
|
|
UNKNOWN - "NULL in (SELECT ...)" has not yet been evaluated
|
|
FALSE - result is FALSE
|
|
TRUE - result is NULL
|
|
*/
|
|
my_bool result_for_null_param;
|
|
public:
|
|
Item_in_optimizer(Item *a, Item_in_subselect *b):
|
|
Item_bool_func(a, my_reinterpret_cast(Item *)(b)), cache(0),
|
|
save_cache(0), result_for_null_param(UNKNOWN)
|
|
{}
|
|
bool fix_fields(THD *, Item **);
|
|
bool fix_left(THD *thd, Item **ref);
|
|
bool is_null();
|
|
longlong val_int();
|
|
void cleanup();
|
|
const char *func_name() const { return "<in_optimizer>"; }
|
|
Item_cache **get_cache() { return &cache; }
|
|
void keep_top_level_cache();
|
|
};
|
|
|
|
class Comp_creator
|
|
{
|
|
public:
|
|
Comp_creator() {} /* Remove gcc warning */
|
|
virtual ~Comp_creator() {} /* Remove gcc warning */
|
|
virtual Item_bool_func2* create(Item *a, Item *b) const = 0;
|
|
virtual const char* symbol(bool invert) const = 0;
|
|
virtual bool eqne_op() const = 0;
|
|
virtual bool l_op() const = 0;
|
|
};
|
|
|
|
class Eq_creator :public Comp_creator
|
|
{
|
|
public:
|
|
Eq_creator() {} /* Remove gcc warning */
|
|
virtual ~Eq_creator() {} /* Remove gcc warning */
|
|
virtual Item_bool_func2* create(Item *a, Item *b) const;
|
|
virtual const char* symbol(bool invert) const { return invert? "<>" : "="; }
|
|
virtual bool eqne_op() const { return 1; }
|
|
virtual bool l_op() const { return 0; }
|
|
};
|
|
|
|
class Ne_creator :public Comp_creator
|
|
{
|
|
public:
|
|
Ne_creator() {} /* Remove gcc warning */
|
|
virtual ~Ne_creator() {} /* Remove gcc warning */
|
|
virtual Item_bool_func2* create(Item *a, Item *b) const;
|
|
virtual const char* symbol(bool invert) const { return invert? "=" : "<>"; }
|
|
virtual bool eqne_op() const { return 1; }
|
|
virtual bool l_op() const { return 0; }
|
|
};
|
|
|
|
class Gt_creator :public Comp_creator
|
|
{
|
|
public:
|
|
Gt_creator() {} /* Remove gcc warning */
|
|
virtual ~Gt_creator() {} /* Remove gcc warning */
|
|
virtual Item_bool_func2* create(Item *a, Item *b) const;
|
|
virtual const char* symbol(bool invert) const { return invert? "<=" : ">"; }
|
|
virtual bool eqne_op() const { return 0; }
|
|
virtual bool l_op() const { return 0; }
|
|
};
|
|
|
|
class Lt_creator :public Comp_creator
|
|
{
|
|
public:
|
|
Lt_creator() {} /* Remove gcc warning */
|
|
virtual ~Lt_creator() {} /* Remove gcc warning */
|
|
virtual Item_bool_func2* create(Item *a, Item *b) const;
|
|
virtual const char* symbol(bool invert) const { return invert? ">=" : "<"; }
|
|
virtual bool eqne_op() const { return 0; }
|
|
virtual bool l_op() const { return 1; }
|
|
};
|
|
|
|
class Ge_creator :public Comp_creator
|
|
{
|
|
public:
|
|
Ge_creator() {} /* Remove gcc warning */
|
|
virtual ~Ge_creator() {} /* Remove gcc warning */
|
|
virtual Item_bool_func2* create(Item *a, Item *b) const;
|
|
virtual const char* symbol(bool invert) const { return invert? "<" : ">="; }
|
|
virtual bool eqne_op() const { return 0; }
|
|
virtual bool l_op() const { return 0; }
|
|
};
|
|
|
|
class Le_creator :public Comp_creator
|
|
{
|
|
public:
|
|
Le_creator() {} /* Remove gcc warning */
|
|
virtual ~Le_creator() {} /* Remove gcc warning */
|
|
virtual Item_bool_func2* create(Item *a, Item *b) const;
|
|
virtual const char* symbol(bool invert) const { return invert? ">" : "<="; }
|
|
virtual bool eqne_op() const { return 0; }
|
|
virtual bool l_op() const { return 1; }
|
|
};
|
|
|
|
class Item_bool_func2 :public Item_int_func
|
|
{ /* Bool with 2 string args */
|
|
protected:
|
|
Arg_comparator cmp;
|
|
String tmp_value1,tmp_value2;
|
|
bool abort_on_null;
|
|
|
|
public:
|
|
Item_bool_func2(Item *a,Item *b)
|
|
:Item_int_func(a,b), cmp(tmp_arg, tmp_arg+1), abort_on_null(FALSE) {}
|
|
void fix_length_and_dec();
|
|
void set_cmp_func()
|
|
{
|
|
cmp.set_cmp_func(this, tmp_arg, tmp_arg+1);
|
|
}
|
|
optimize_type select_optimize() const { return OPTIMIZE_OP; }
|
|
virtual enum Functype rev_functype() const { return UNKNOWN_FUNC; }
|
|
bool have_rev_func() const { return rev_functype() != UNKNOWN_FUNC; }
|
|
void print(String *str) { Item_func::print_op(str); }
|
|
bool is_null() { return test(args[0]->is_null() || args[1]->is_null()); }
|
|
bool is_bool_func() { return 1; }
|
|
CHARSET_INFO *compare_collation() { return cmp.cmp_collation.collation; }
|
|
uint decimal_precision() const { return 1; }
|
|
void top_level_item() { abort_on_null=1; }
|
|
|
|
friend class Arg_comparator;
|
|
};
|
|
|
|
class Item_bool_rowready_func2 :public Item_bool_func2
|
|
{
|
|
public:
|
|
Item_bool_rowready_func2(Item *a, Item *b) :Item_bool_func2(a, b)
|
|
{
|
|
allowed_arg_cols= 0; // Fetch this value from first argument
|
|
}
|
|
Item *neg_transformer(THD *thd);
|
|
virtual Item *negated_item();
|
|
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
|
bool subst_argument_checker(byte **arg) { return TRUE; }
|
|
};
|
|
|
|
class Item_func_not :public Item_bool_func
|
|
{
|
|
public:
|
|
Item_func_not(Item *a) :Item_bool_func(a) {}
|
|
longlong val_int();
|
|
enum Functype functype() const { return NOT_FUNC; }
|
|
const char *func_name() const { return "not"; }
|
|
Item *neg_transformer(THD *thd);
|
|
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
|
};
|
|
|
|
class Item_maxmin_subselect;
|
|
|
|
/*
|
|
trigcond<param>(arg) ::= param? arg : TRUE
|
|
|
|
The class Item_func_trig_cond is used for guarded predicates
|
|
which are employed only for internal purposes.
|
|
A guarded predicate is an object consisting of an a regular or
|
|
a guarded predicate P and a pointer to a boolean guard variable g.
|
|
A guarded predicate P/g is evaluated to true if the value of the
|
|
guard g is false, otherwise it is evaluated to the same value that
|
|
the predicate P: val(P/g)= g ? val(P):true.
|
|
Guarded predicates allow us to include predicates into a conjunction
|
|
conditionally. Currently they are utilized for pushed down predicates
|
|
in queries with outer join operations.
|
|
|
|
In the future, probably, it makes sense to extend this class to
|
|
the objects consisting of three elements: a predicate P, a pointer
|
|
to a variable g and a firing value s with following evaluation
|
|
rule: val(P/g,s)= g==s? val(P) : true. It will allow us to build only
|
|
one item for the objects of the form P/g1/g2...
|
|
|
|
Objects of this class are built only for query execution after
|
|
the execution plan has been already selected. That's why this
|
|
class needs only val_int out of generic methods.
|
|
|
|
Current uses of Item_func_trig_cond objects:
|
|
- To wrap selection conditions when executing outer joins
|
|
- To wrap condition that is pushed down into subquery
|
|
*/
|
|
|
|
class Item_func_trig_cond: public Item_bool_func
|
|
{
|
|
bool *trig_var;
|
|
public:
|
|
Item_func_trig_cond(Item *a, bool *f) : Item_bool_func(a) { trig_var= f; }
|
|
longlong val_int() { return *trig_var ? args[0]->val_int() : 1; }
|
|
enum Functype functype() const { return TRIG_COND_FUNC; };
|
|
const char *func_name() const { return "trigcond"; };
|
|
bool const_item() const { return FALSE; }
|
|
};
|
|
|
|
class Item_func_not_all :public Item_func_not
|
|
{
|
|
/* allow to check presence of values in max/min optimization */
|
|
Item_sum_hybrid *test_sum_item;
|
|
Item_maxmin_subselect *test_sub_item;
|
|
|
|
bool abort_on_null;
|
|
public:
|
|
bool show;
|
|
|
|
Item_func_not_all(Item *a)
|
|
:Item_func_not(a), test_sum_item(0), test_sub_item(0), abort_on_null(0),
|
|
show(0)
|
|
{}
|
|
virtual void top_level_item() { abort_on_null= 1; }
|
|
bool top_level() { return abort_on_null; }
|
|
longlong val_int();
|
|
enum Functype functype() const { return NOT_ALL_FUNC; }
|
|
const char *func_name() const { return "<not>"; }
|
|
void print(String *str);
|
|
void set_sum_test(Item_sum_hybrid *item) { test_sum_item= item; };
|
|
void set_sub_test(Item_maxmin_subselect *item) { test_sub_item= item; };
|
|
bool empty_underlying_subquery();
|
|
Item *neg_transformer(THD *thd);
|
|
};
|
|
|
|
|
|
class Item_func_nop_all :public Item_func_not_all
|
|
{
|
|
public:
|
|
|
|
Item_func_nop_all(Item *a) :Item_func_not_all(a) {}
|
|
longlong val_int();
|
|
const char *func_name() const { return "<nop>"; }
|
|
Item *neg_transformer(THD *thd);
|
|
};
|
|
|
|
|
|
class Item_func_eq :public Item_bool_rowready_func2
|
|
{
|
|
public:
|
|
Item_func_eq(Item *a,Item *b) :Item_bool_rowready_func2(a,b) {}
|
|
longlong val_int();
|
|
enum Functype functype() const { return EQ_FUNC; }
|
|
enum Functype rev_functype() const { return EQ_FUNC; }
|
|
cond_result eq_cmp_result() const { return COND_TRUE; }
|
|
const char *func_name() const { return "="; }
|
|
Item *negated_item();
|
|
};
|
|
|
|
class Item_func_equal :public Item_bool_rowready_func2
|
|
{
|
|
public:
|
|
Item_func_equal(Item *a,Item *b) :Item_bool_rowready_func2(a,b) {};
|
|
longlong val_int();
|
|
void fix_length_and_dec();
|
|
table_map not_null_tables() const { return 0; }
|
|
enum Functype functype() const { return EQUAL_FUNC; }
|
|
enum Functype rev_functype() const { return EQUAL_FUNC; }
|
|
cond_result eq_cmp_result() const { return COND_TRUE; }
|
|
const char *func_name() const { return "<=>"; }
|
|
Item *neg_transformer(THD *thd) { return 0; }
|
|
};
|
|
|
|
|
|
class Item_func_ge :public Item_bool_rowready_func2
|
|
{
|
|
public:
|
|
Item_func_ge(Item *a,Item *b) :Item_bool_rowready_func2(a,b) {};
|
|
longlong val_int();
|
|
enum Functype functype() const { return GE_FUNC; }
|
|
enum Functype rev_functype() const { return LE_FUNC; }
|
|
cond_result eq_cmp_result() const { return COND_TRUE; }
|
|
const char *func_name() const { return ">="; }
|
|
Item *negated_item();
|
|
};
|
|
|
|
|
|
class Item_func_gt :public Item_bool_rowready_func2
|
|
{
|
|
public:
|
|
Item_func_gt(Item *a,Item *b) :Item_bool_rowready_func2(a,b) {};
|
|
longlong val_int();
|
|
enum Functype functype() const { return GT_FUNC; }
|
|
enum Functype rev_functype() const { return LT_FUNC; }
|
|
cond_result eq_cmp_result() const { return COND_FALSE; }
|
|
const char *func_name() const { return ">"; }
|
|
Item *negated_item();
|
|
};
|
|
|
|
|
|
class Item_func_le :public Item_bool_rowready_func2
|
|
{
|
|
public:
|
|
Item_func_le(Item *a,Item *b) :Item_bool_rowready_func2(a,b) {};
|
|
longlong val_int();
|
|
enum Functype functype() const { return LE_FUNC; }
|
|
enum Functype rev_functype() const { return GE_FUNC; }
|
|
cond_result eq_cmp_result() const { return COND_TRUE; }
|
|
const char *func_name() const { return "<="; }
|
|
Item *negated_item();
|
|
};
|
|
|
|
|
|
class Item_func_lt :public Item_bool_rowready_func2
|
|
{
|
|
public:
|
|
Item_func_lt(Item *a,Item *b) :Item_bool_rowready_func2(a,b) {}
|
|
longlong val_int();
|
|
enum Functype functype() const { return LT_FUNC; }
|
|
enum Functype rev_functype() const { return GT_FUNC; }
|
|
cond_result eq_cmp_result() const { return COND_FALSE; }
|
|
const char *func_name() const { return "<"; }
|
|
Item *negated_item();
|
|
};
|
|
|
|
|
|
class Item_func_ne :public Item_bool_rowready_func2
|
|
{
|
|
public:
|
|
Item_func_ne(Item *a,Item *b) :Item_bool_rowready_func2(a,b) {}
|
|
longlong val_int();
|
|
enum Functype functype() const { return NE_FUNC; }
|
|
cond_result eq_cmp_result() const { return COND_FALSE; }
|
|
optimize_type select_optimize() const { return OPTIMIZE_KEY; }
|
|
const char *func_name() const { return "<>"; }
|
|
Item *negated_item();
|
|
};
|
|
|
|
|
|
/*
|
|
The class Item_func_opt_neg is defined to factor out the functionality
|
|
common for the classes Item_func_between and Item_func_in. The objects
|
|
of these classes can express predicates or there negations.
|
|
The alternative approach would be to create pairs Item_func_between,
|
|
Item_func_notbetween and Item_func_in, Item_func_notin.
|
|
|
|
*/
|
|
|
|
class Item_func_opt_neg :public Item_int_func
|
|
{
|
|
public:
|
|
bool negated; /* <=> the item represents NOT <func> */
|
|
bool pred_level; /* <=> [NOT] <func> is used on a predicate level */
|
|
public:
|
|
Item_func_opt_neg(Item *a, Item *b, Item *c)
|
|
:Item_int_func(a, b, c), negated(0), pred_level(0) {}
|
|
Item_func_opt_neg(List<Item> &list)
|
|
:Item_int_func(list), negated(0), pred_level(0) {}
|
|
public:
|
|
inline void negate() { negated= !negated; }
|
|
inline void top_level_item() { pred_level= 1; }
|
|
Item *neg_transformer(THD *thd)
|
|
{
|
|
negated= !negated;
|
|
return this;
|
|
}
|
|
bool subst_argument_checker(byte **arg) { return TRUE; }
|
|
};
|
|
|
|
|
|
class Item_func_between :public Item_func_opt_neg
|
|
{
|
|
DTCollation cmp_collation;
|
|
public:
|
|
Item_result cmp_type;
|
|
String value0,value1,value2;
|
|
Item_func_between(Item *a, Item *b, Item *c)
|
|
:Item_func_opt_neg(a, b, c) {}
|
|
longlong val_int();
|
|
optimize_type select_optimize() const { return OPTIMIZE_KEY; }
|
|
enum Functype functype() const { return BETWEEN; }
|
|
const char *func_name() const { return "between"; }
|
|
bool fix_fields(THD *, Item **);
|
|
void fix_length_and_dec();
|
|
void print(String *str);
|
|
bool is_bool_func() { return 1; }
|
|
CHARSET_INFO *compare_collation() { return cmp_collation.collation; }
|
|
uint decimal_precision() const { return 1; }
|
|
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
|
};
|
|
|
|
|
|
class Item_func_strcmp :public Item_bool_func2
|
|
{
|
|
public:
|
|
Item_func_strcmp(Item *a,Item *b) :Item_bool_func2(a,b) {}
|
|
longlong val_int();
|
|
optimize_type select_optimize() const { return OPTIMIZE_NONE; }
|
|
const char *func_name() const { return "strcmp"; }
|
|
void print(String *str) { Item_func::print(str); }
|
|
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
|
};
|
|
|
|
|
|
struct interval_range
|
|
{
|
|
Item_result type;
|
|
double dbl;
|
|
my_decimal dec;
|
|
};
|
|
|
|
class Item_func_interval :public Item_int_func
|
|
{
|
|
Item_row *row;
|
|
my_bool use_decimal_comparison;
|
|
interval_range *intervals;
|
|
public:
|
|
Item_func_interval(Item_row *a)
|
|
:Item_int_func(a),row(a),intervals(0)
|
|
{
|
|
allowed_arg_cols= 0; // Fetch this value from first argument
|
|
}
|
|
longlong val_int();
|
|
void fix_length_and_dec();
|
|
const char *func_name() const { return "interval"; }
|
|
uint decimal_precision() const { return 2; }
|
|
};
|
|
|
|
|
|
class Item_func_coalesce :public Item_func_numhybrid
|
|
{
|
|
protected:
|
|
Item_func_coalesce(Item *a, Item *b) :Item_func_numhybrid(a, b) {}
|
|
public:
|
|
Item_func_coalesce(List<Item> &list) :Item_func_numhybrid(list) {}
|
|
double real_op();
|
|
longlong int_op();
|
|
String *str_op(String *);
|
|
my_decimal *decimal_op(my_decimal *);
|
|
void fix_length_and_dec();
|
|
void find_num_type() {}
|
|
enum Item_result result_type () const { return hybrid_type; }
|
|
const char *func_name() const { return "coalesce"; }
|
|
table_map not_null_tables() const { return 0; }
|
|
};
|
|
|
|
|
|
class Item_func_ifnull :public Item_func_coalesce
|
|
{
|
|
protected:
|
|
enum_field_types cached_field_type;
|
|
bool field_type_defined;
|
|
public:
|
|
Item_func_ifnull(Item *a, Item *b) :Item_func_coalesce(a,b) {}
|
|
double real_op();
|
|
longlong int_op();
|
|
String *str_op(String *str);
|
|
my_decimal *decimal_op(my_decimal *);
|
|
enum_field_types field_type() const;
|
|
void fix_length_and_dec();
|
|
const char *func_name() const { return "ifnull"; }
|
|
Field *tmp_table_field(TABLE *table);
|
|
uint decimal_precision() const;
|
|
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
|
};
|
|
|
|
|
|
class Item_func_if :public Item_func
|
|
{
|
|
enum Item_result cached_result_type;
|
|
public:
|
|
Item_func_if(Item *a,Item *b,Item *c)
|
|
:Item_func(a,b,c), cached_result_type(INT_RESULT)
|
|
{}
|
|
double val_real();
|
|
longlong val_int();
|
|
String *val_str(String *str);
|
|
my_decimal *val_decimal(my_decimal *);
|
|
enum Item_result result_type () const { return cached_result_type; }
|
|
bool fix_fields(THD *, Item **);
|
|
void fix_length_and_dec();
|
|
uint decimal_precision() const;
|
|
const char *func_name() const { return "if"; }
|
|
};
|
|
|
|
|
|
class Item_func_nullif :public Item_bool_func2
|
|
{
|
|
enum Item_result cached_result_type;
|
|
public:
|
|
Item_func_nullif(Item *a,Item *b)
|
|
:Item_bool_func2(a,b), cached_result_type(INT_RESULT)
|
|
{}
|
|
double val_real();
|
|
longlong val_int();
|
|
String *val_str(String *str);
|
|
my_decimal *val_decimal(my_decimal *);
|
|
enum Item_result result_type () const { return cached_result_type; }
|
|
void fix_length_and_dec();
|
|
uint decimal_precision() const { return args[0]->decimal_precision(); }
|
|
const char *func_name() const { return "nullif"; }
|
|
void print(String *str) { Item_func::print(str); }
|
|
table_map not_null_tables() const { return 0; }
|
|
bool is_null();
|
|
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
|
};
|
|
|
|
/* Functions to handle the optimized IN */
|
|
|
|
|
|
/* A vector of values of some type */
|
|
|
|
class in_vector :public Sql_alloc
|
|
{
|
|
public:
|
|
char *base;
|
|
uint size;
|
|
qsort2_cmp compare;
|
|
CHARSET_INFO *collation;
|
|
uint count;
|
|
uint used_count;
|
|
in_vector() {}
|
|
in_vector(uint elements,uint element_length,qsort2_cmp cmp_func,
|
|
CHARSET_INFO *cmp_coll)
|
|
:base((char*) sql_calloc(elements*element_length)),
|
|
size(element_length), compare(cmp_func), collation(cmp_coll),
|
|
count(elements), used_count(elements) {}
|
|
virtual ~in_vector() {}
|
|
virtual void set(uint pos,Item *item)=0;
|
|
virtual byte *get_value(Item *item)=0;
|
|
void sort()
|
|
{
|
|
qsort2(base,used_count,size,compare,collation);
|
|
}
|
|
int find(Item *item);
|
|
|
|
/*
|
|
Create an instance of Item_{type} (e.g. Item_decimal) constant object
|
|
which type allows it to hold an element of this vector without any
|
|
conversions.
|
|
The purpose of this function is to be able to get elements of this
|
|
vector in form of Item_xxx constants without creating Item_xxx object
|
|
for every array element you get (i.e. this implements "FlyWeight" pattern)
|
|
*/
|
|
virtual Item* create_item() { return NULL; }
|
|
|
|
/*
|
|
Store the value at position #pos into provided item object
|
|
SYNOPSIS
|
|
value_to_item()
|
|
pos Index of value to store
|
|
item Constant item to store value into. The item must be of the same
|
|
type that create_item() returns.
|
|
*/
|
|
virtual void value_to_item(uint pos, Item *item) { }
|
|
|
|
/* Compare values number pos1 and pos2 for equality */
|
|
bool compare_elems(uint pos1, uint pos2)
|
|
{
|
|
return test(compare(collation, base + pos1*size, base + pos2*size));
|
|
}
|
|
virtual Item_result result_type()= 0;
|
|
};
|
|
|
|
class in_string :public in_vector
|
|
{
|
|
char buff[STRING_BUFFER_USUAL_SIZE];
|
|
String tmp;
|
|
public:
|
|
in_string(uint elements,qsort2_cmp cmp_func, CHARSET_INFO *cs);
|
|
~in_string();
|
|
void set(uint pos,Item *item);
|
|
byte *get_value(Item *item);
|
|
Item* create_item()
|
|
{
|
|
return new Item_string(collation);
|
|
}
|
|
void value_to_item(uint pos, Item *item)
|
|
{
|
|
String *str=((String*) base)+pos;
|
|
Item_string *to= (Item_string*)item;
|
|
to->str_value= *str;
|
|
}
|
|
Item_result result_type() { return STRING_RESULT; }
|
|
};
|
|
|
|
class in_longlong :public in_vector
|
|
{
|
|
longlong tmp;
|
|
public:
|
|
in_longlong(uint elements);
|
|
void set(uint pos,Item *item);
|
|
byte *get_value(Item *item);
|
|
|
|
Item* create_item()
|
|
{
|
|
/*
|
|
We're created a signed INT, this may not be correct in
|
|
general case (see BUG#19342).
|
|
*/
|
|
return new Item_int((longlong)0);
|
|
}
|
|
void value_to_item(uint pos, Item *item)
|
|
{
|
|
((Item_int*)item)->value= ((longlong*)base)[pos];
|
|
}
|
|
Item_result result_type() { return INT_RESULT; }
|
|
};
|
|
|
|
class in_double :public in_vector
|
|
{
|
|
double tmp;
|
|
public:
|
|
in_double(uint elements);
|
|
void set(uint pos,Item *item);
|
|
byte *get_value(Item *item);
|
|
Item *create_item()
|
|
{
|
|
return new Item_float(0.0);
|
|
}
|
|
void value_to_item(uint pos, Item *item)
|
|
{
|
|
((Item_float*)item)->value= ((double*) base)[pos];
|
|
}
|
|
Item_result result_type() { return REAL_RESULT; }
|
|
|
|
};
|
|
|
|
class in_decimal :public in_vector
|
|
{
|
|
my_decimal val;
|
|
public:
|
|
in_decimal(uint elements);
|
|
void set(uint pos, Item *item);
|
|
byte *get_value(Item *item);
|
|
Item *create_item()
|
|
{
|
|
return new Item_decimal(0, FALSE);
|
|
}
|
|
void value_to_item(uint pos, Item *item)
|
|
{
|
|
my_decimal *dec= ((my_decimal *)base) + pos;
|
|
Item_decimal *item_dec= (Item_decimal*)item;
|
|
item_dec->set_decimal_value(dec);
|
|
}
|
|
Item_result result_type() { return DECIMAL_RESULT; }
|
|
|
|
};
|
|
|
|
|
|
/*
|
|
** Classes for easy comparing of non const items
|
|
*/
|
|
|
|
class cmp_item :public Sql_alloc
|
|
{
|
|
public:
|
|
CHARSET_INFO *cmp_charset;
|
|
cmp_item() { cmp_charset= &my_charset_bin; }
|
|
virtual ~cmp_item() {}
|
|
virtual void store_value(Item *item)= 0;
|
|
virtual int cmp(Item *item)= 0;
|
|
// for optimized IN with row
|
|
virtual int compare(cmp_item *item)= 0;
|
|
static cmp_item* get_comparator(Item_result type, CHARSET_INFO *cs);
|
|
virtual cmp_item *make_same()= 0;
|
|
virtual void store_value_by_template(cmp_item *tmpl, Item *item)
|
|
{
|
|
store_value(item);
|
|
}
|
|
};
|
|
|
|
class cmp_item_string :public cmp_item
|
|
{
|
|
protected:
|
|
String *value_res;
|
|
public:
|
|
cmp_item_string () {}
|
|
cmp_item_string (CHARSET_INFO *cs) { cmp_charset= cs; }
|
|
void set_charset(CHARSET_INFO *cs) { cmp_charset= cs; }
|
|
friend class cmp_item_sort_string;
|
|
friend class cmp_item_sort_string_in_static;
|
|
};
|
|
|
|
class cmp_item_sort_string :public cmp_item_string
|
|
{
|
|
protected:
|
|
char value_buff[STRING_BUFFER_USUAL_SIZE];
|
|
String value;
|
|
public:
|
|
cmp_item_sort_string():
|
|
cmp_item_string() {}
|
|
cmp_item_sort_string(CHARSET_INFO *cs):
|
|
cmp_item_string(cs),
|
|
value(value_buff, sizeof(value_buff), cs) {}
|
|
void store_value(Item *item)
|
|
{
|
|
value_res= item->val_str(&value);
|
|
}
|
|
int cmp(Item *arg)
|
|
{
|
|
char buff[STRING_BUFFER_USUAL_SIZE];
|
|
String tmp(buff, sizeof(buff), cmp_charset), *res;
|
|
res= arg->val_str(&tmp);
|
|
return (value_res ? (res ? sortcmp(value_res, res, cmp_charset) : 1) :
|
|
(res ? -1 : 0));
|
|
}
|
|
int compare(cmp_item *c)
|
|
{
|
|
cmp_item_string *cmp= (cmp_item_string *)c;
|
|
return sortcmp(value_res, cmp->value_res, cmp_charset);
|
|
}
|
|
cmp_item *make_same();
|
|
void set_charset(CHARSET_INFO *cs)
|
|
{
|
|
cmp_charset= cs;
|
|
value.set_quick(value_buff, sizeof(value_buff), cs);
|
|
}
|
|
};
|
|
|
|
class cmp_item_int :public cmp_item
|
|
{
|
|
longlong value;
|
|
public:
|
|
cmp_item_int() {} /* Remove gcc warning */
|
|
void store_value(Item *item)
|
|
{
|
|
value= item->val_int();
|
|
}
|
|
int cmp(Item *arg)
|
|
{
|
|
return value != arg->val_int();
|
|
}
|
|
int compare(cmp_item *c)
|
|
{
|
|
cmp_item_int *cmp= (cmp_item_int *)c;
|
|
return (value < cmp->value) ? -1 : ((value == cmp->value) ? 0 : 1);
|
|
}
|
|
cmp_item *make_same();
|
|
};
|
|
|
|
class cmp_item_real :public cmp_item
|
|
{
|
|
double value;
|
|
public:
|
|
cmp_item_real() {} /* Remove gcc warning */
|
|
void store_value(Item *item)
|
|
{
|
|
value= item->val_real();
|
|
}
|
|
int cmp(Item *arg)
|
|
{
|
|
return value != arg->val_real();
|
|
}
|
|
int compare(cmp_item *c)
|
|
{
|
|
cmp_item_real *cmp= (cmp_item_real *)c;
|
|
return (value < cmp->value)? -1 : ((value == cmp->value) ? 0 : 1);
|
|
}
|
|
cmp_item *make_same();
|
|
};
|
|
|
|
|
|
class cmp_item_decimal :public cmp_item
|
|
{
|
|
my_decimal value;
|
|
public:
|
|
cmp_item_decimal() {} /* Remove gcc warning */
|
|
void store_value(Item *item);
|
|
int cmp(Item *arg);
|
|
int compare(cmp_item *c);
|
|
cmp_item *make_same();
|
|
};
|
|
|
|
|
|
class cmp_item_row :public cmp_item
|
|
{
|
|
cmp_item **comparators;
|
|
uint n;
|
|
public:
|
|
cmp_item_row(): comparators(0), n(0) {}
|
|
~cmp_item_row();
|
|
void store_value(Item *item);
|
|
int cmp(Item *arg);
|
|
int compare(cmp_item *arg);
|
|
cmp_item *make_same();
|
|
void store_value_by_template(cmp_item *tmpl, Item *);
|
|
};
|
|
|
|
|
|
class in_row :public in_vector
|
|
{
|
|
cmp_item_row tmp;
|
|
public:
|
|
in_row(uint elements, Item *);
|
|
~in_row();
|
|
void set(uint pos,Item *item);
|
|
byte *get_value(Item *item);
|
|
Item_result result_type() { return ROW_RESULT; }
|
|
};
|
|
|
|
/*
|
|
cmp_item for optimized IN with row (right part string, which never
|
|
be changed)
|
|
*/
|
|
|
|
class cmp_item_sort_string_in_static :public cmp_item_string
|
|
{
|
|
protected:
|
|
String value;
|
|
public:
|
|
cmp_item_sort_string_in_static(CHARSET_INFO *cs):
|
|
cmp_item_string(cs) {}
|
|
void store_value(Item *item)
|
|
{
|
|
value_res= item->val_str(&value);
|
|
}
|
|
int cmp(Item *item)
|
|
{
|
|
// Should never be called
|
|
DBUG_ASSERT(0);
|
|
return 1;
|
|
}
|
|
int compare(cmp_item *c)
|
|
{
|
|
cmp_item_string *cmp= (cmp_item_string *)c;
|
|
return sortcmp(value_res, cmp->value_res, cmp_charset);
|
|
}
|
|
cmp_item *make_same()
|
|
{
|
|
return new cmp_item_sort_string_in_static(cmp_charset);
|
|
}
|
|
};
|
|
|
|
|
|
/*
|
|
The class Item_func_case is the CASE ... WHEN ... THEN ... END function
|
|
implementation.
|
|
|
|
When there is no expression between CASE and the first WHEN
|
|
(the CASE expression) then this function simple checks all WHEN expressions
|
|
one after another. When some WHEN expression evaluated to TRUE then the
|
|
value of the corresponding THEN expression is returned.
|
|
|
|
When the CASE expression is specified then it is compared to each WHEN
|
|
expression individually. When an equal WHEN expression is found
|
|
corresponding THEN expression is returned.
|
|
In order to do correct comparisons several comparators are used. One for
|
|
each result type. Different result types that are used in particular
|
|
CASE ... END expression are collected in the fix_length_and_dec() member
|
|
function and only comparators for there result types are used.
|
|
*/
|
|
|
|
class Item_func_case :public Item_func
|
|
{
|
|
int first_expr_num, else_expr_num;
|
|
enum Item_result cached_result_type, left_result_type;
|
|
String tmp_value;
|
|
uint ncases;
|
|
Item_result cmp_type;
|
|
DTCollation cmp_collation;
|
|
cmp_item *cmp_items[5]; /* For all result types */
|
|
cmp_item *case_item;
|
|
public:
|
|
Item_func_case(List<Item> &list, Item *first_expr_arg, Item *else_expr_arg)
|
|
:Item_func(), first_expr_num(-1), else_expr_num(-1),
|
|
cached_result_type(INT_RESULT), left_result_type(INT_RESULT), case_item(0)
|
|
{
|
|
ncases= list.elements;
|
|
if (first_expr_arg)
|
|
{
|
|
first_expr_num= list.elements;
|
|
list.push_back(first_expr_arg);
|
|
}
|
|
if (else_expr_arg)
|
|
{
|
|
else_expr_num= list.elements;
|
|
list.push_back(else_expr_arg);
|
|
}
|
|
set_arguments(list);
|
|
bzero(&cmp_items, sizeof(cmp_items));
|
|
}
|
|
double val_real();
|
|
longlong val_int();
|
|
String *val_str(String *);
|
|
my_decimal *val_decimal(my_decimal *);
|
|
bool fix_fields(THD *thd, Item **ref);
|
|
void fix_length_and_dec();
|
|
uint decimal_precision() const;
|
|
table_map not_null_tables() const { return 0; }
|
|
enum Item_result result_type () const { return cached_result_type; }
|
|
const char *func_name() const { return "case"; }
|
|
void print(String *str);
|
|
Item *find_item(String *str);
|
|
CHARSET_INFO *compare_collation() { return cmp_collation.collation; }
|
|
bool check_partition_func_processor(byte *bool_arg) { return FALSE;}
|
|
void cleanup()
|
|
{
|
|
uint i;
|
|
DBUG_ENTER("Item_func_case::cleanup");
|
|
Item_func::cleanup();
|
|
for (i= 0; i <= (uint)DECIMAL_RESULT; i++)
|
|
{
|
|
delete cmp_items[i];
|
|
cmp_items[i]= 0;
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
};
|
|
|
|
/*
|
|
The Item_func_in class implements the in_expr IN(values_list) function.
|
|
|
|
The current implementation distinguishes 2 cases:
|
|
1) all items in the value_list are constants and have the same
|
|
result type. This case is handled by in_vector class.
|
|
2) items in the value_list have different result types or there is some
|
|
non-constant items.
|
|
In this case Item_func_in employs several cmp_item objects to performs
|
|
comparisons of in_expr and an item from the values_list. One cmp_item
|
|
object for each result type. Different result types are collected in the
|
|
fix_length_and_dec() member function by means of collect_cmp_types()
|
|
function.
|
|
*/
|
|
class Item_func_in :public Item_func_opt_neg
|
|
{
|
|
public:
|
|
in_vector *array;
|
|
bool have_null;
|
|
Item_result left_result_type;
|
|
cmp_item *cmp_items[5]; /* One cmp_item for each result type */
|
|
DTCollation cmp_collation;
|
|
|
|
Item_func_in(List<Item> &list)
|
|
:Item_func_opt_neg(list), array(0), have_null(0)
|
|
{
|
|
bzero(&cmp_items, sizeof(cmp_items));
|
|
allowed_arg_cols= 0; // Fetch this value from first argument
|
|
}
|
|
longlong val_int();
|
|
bool fix_fields(THD *, Item **);
|
|
void fix_length_and_dec();
|
|
uint decimal_precision() const { return 1; }
|
|
void cleanup()
|
|
{
|
|
uint i;
|
|
DBUG_ENTER("Item_func_in::cleanup");
|
|
Item_int_func::cleanup();
|
|
delete array;
|
|
array= 0;
|
|
for (i= 0; i <= (uint)DECIMAL_RESULT; i++)
|
|
{
|
|
delete cmp_items[i];
|
|
cmp_items[i]= 0;
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
optimize_type select_optimize() const
|
|
{ return array ? OPTIMIZE_KEY : OPTIMIZE_NONE; }
|
|
void print(String *str);
|
|
enum Functype functype() const { return IN_FUNC; }
|
|
const char *func_name() const { return " IN "; }
|
|
bool nulls_in_row();
|
|
bool is_bool_func() { return 1; }
|
|
CHARSET_INFO *compare_collation() { return cmp_collation.collation; }
|
|
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
|
};
|
|
|
|
/* Functions used by where clause */
|
|
|
|
class Item_func_isnull :public Item_bool_func
|
|
{
|
|
protected:
|
|
longlong cached_value;
|
|
public:
|
|
Item_func_isnull(Item *a) :Item_bool_func(a) {}
|
|
longlong val_int();
|
|
enum Functype functype() const { return ISNULL_FUNC; }
|
|
void fix_length_and_dec()
|
|
{
|
|
decimals=0; max_length=1; maybe_null=0;
|
|
update_used_tables();
|
|
}
|
|
const char *func_name() const { return "isnull"; }
|
|
/* Optimize case of not_null_column IS NULL */
|
|
virtual void update_used_tables()
|
|
{
|
|
if (!args[0]->maybe_null)
|
|
{
|
|
used_tables_cache= 0; /* is always false */
|
|
const_item_cache= 1;
|
|
cached_value= (longlong) 0;
|
|
}
|
|
else
|
|
{
|
|
args[0]->update_used_tables();
|
|
if ((const_item_cache= !(used_tables_cache= args[0]->used_tables())))
|
|
{
|
|
/* Remember if the value is always NULL or never NULL */
|
|
cached_value= (longlong) args[0]->is_null();
|
|
}
|
|
}
|
|
}
|
|
table_map not_null_tables() const { return 0; }
|
|
optimize_type select_optimize() const { return OPTIMIZE_NULL; }
|
|
Item *neg_transformer(THD *thd);
|
|
CHARSET_INFO *compare_collation() { return args[0]->collation.collation; }
|
|
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
|
};
|
|
|
|
/* Functions used by HAVING for rewriting IN subquery */
|
|
|
|
class Item_in_subselect;
|
|
|
|
/*
|
|
This is like IS NOT NULL but it also remembers if it ever has
|
|
encountered a NULL.
|
|
*/
|
|
class Item_is_not_null_test :public Item_func_isnull
|
|
{
|
|
Item_in_subselect* owner;
|
|
public:
|
|
Item_is_not_null_test(Item_in_subselect* ow, Item *a)
|
|
:Item_func_isnull(a), owner(ow)
|
|
{}
|
|
enum Functype functype() const { return ISNOTNULLTEST_FUNC; }
|
|
longlong val_int();
|
|
const char *func_name() const { return "<is_not_null_test>"; }
|
|
void update_used_tables();
|
|
/*
|
|
we add RAND_TABLE_BIT to prevent moving this item from HAVING to WHERE
|
|
*/
|
|
table_map used_tables() const
|
|
{ return used_tables_cache | RAND_TABLE_BIT; }
|
|
bool check_partition_func_processor(byte *int_arg) {return TRUE;}
|
|
};
|
|
|
|
|
|
class Item_func_isnotnull :public Item_bool_func
|
|
{
|
|
bool abort_on_null;
|
|
public:
|
|
Item_func_isnotnull(Item *a) :Item_bool_func(a), abort_on_null(0) {}
|
|
longlong val_int();
|
|
enum Functype functype() const { return ISNOTNULL_FUNC; }
|
|
void fix_length_and_dec()
|
|
{
|
|
decimals=0; max_length=1; maybe_null=0;
|
|
}
|
|
const char *func_name() const { return "isnotnull"; }
|
|
optimize_type select_optimize() const { return OPTIMIZE_NULL; }
|
|
table_map not_null_tables() const
|
|
{ return abort_on_null ? not_null_tables_cache : 0; }
|
|
Item *neg_transformer(THD *thd);
|
|
void print(String *str);
|
|
CHARSET_INFO *compare_collation() { return args[0]->collation.collation; }
|
|
void top_level_item() { abort_on_null=1; }
|
|
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
|
};
|
|
|
|
|
|
class Item_func_like :public Item_bool_func2
|
|
{
|
|
// Turbo Boyer-Moore data
|
|
bool canDoTurboBM; // pattern is '%abcd%' case
|
|
const char* pattern;
|
|
int pattern_len;
|
|
|
|
// TurboBM buffers, *this is owner
|
|
int* bmGs; // good suffix shift table, size is pattern_len + 1
|
|
int* bmBc; // bad character shift table, size is alphabet_size
|
|
|
|
void turboBM_compute_suffixes(int* suff);
|
|
void turboBM_compute_good_suffix_shifts(int* suff);
|
|
void turboBM_compute_bad_character_shifts();
|
|
bool turboBM_matches(const char* text, int text_len) const;
|
|
enum { alphabet_size = 256 };
|
|
|
|
Item *escape_item;
|
|
|
|
bool escape_used_in_parsing;
|
|
|
|
public:
|
|
int escape;
|
|
|
|
Item_func_like(Item *a,Item *b, Item *escape_arg, bool escape_used)
|
|
:Item_bool_func2(a,b), canDoTurboBM(FALSE), pattern(0), pattern_len(0),
|
|
bmGs(0), bmBc(0), escape_item(escape_arg),
|
|
escape_used_in_parsing(escape_used) {}
|
|
longlong val_int();
|
|
enum Functype functype() const { return LIKE_FUNC; }
|
|
optimize_type select_optimize() const;
|
|
cond_result eq_cmp_result() const { return COND_TRUE; }
|
|
const char *func_name() const { return "like"; }
|
|
bool fix_fields(THD *thd, Item **ref);
|
|
void cleanup();
|
|
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
|
};
|
|
|
|
#ifdef USE_REGEX
|
|
|
|
#include "my_regex.h"
|
|
|
|
class Item_func_regex :public Item_bool_func
|
|
{
|
|
my_regex_t preg;
|
|
bool regex_compiled;
|
|
bool regex_is_const;
|
|
String prev_regexp;
|
|
DTCollation cmp_collation;
|
|
public:
|
|
Item_func_regex(Item *a,Item *b) :Item_bool_func(a,b),
|
|
regex_compiled(0),regex_is_const(0) {}
|
|
void cleanup();
|
|
longlong val_int();
|
|
bool fix_fields(THD *thd, Item **ref);
|
|
const char *func_name() const { return "regexp"; }
|
|
void print(String *str) { print_op(str); }
|
|
CHARSET_INFO *compare_collation() { return cmp_collation.collation; }
|
|
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
|
};
|
|
|
|
#else
|
|
|
|
class Item_func_regex :public Item_bool_func
|
|
{
|
|
public:
|
|
Item_func_regex(Item *a,Item *b) :Item_bool_func(a,b) {}
|
|
longlong val_int() { return 0;}
|
|
const char *func_name() const { return "regex"; }
|
|
void print(String *str) { print_op(str); }
|
|
};
|
|
|
|
#endif /* USE_REGEX */
|
|
|
|
|
|
typedef class Item COND;
|
|
|
|
class Item_cond :public Item_bool_func
|
|
{
|
|
protected:
|
|
List<Item> list;
|
|
bool abort_on_null;
|
|
table_map and_tables_cache;
|
|
|
|
public:
|
|
/* Item_cond() is only used to create top level items */
|
|
Item_cond(): Item_bool_func(), abort_on_null(1)
|
|
{ const_item_cache=0; }
|
|
Item_cond(Item *i1,Item *i2)
|
|
:Item_bool_func(), abort_on_null(0)
|
|
{
|
|
list.push_back(i1);
|
|
list.push_back(i2);
|
|
}
|
|
Item_cond(THD *thd, Item_cond *item);
|
|
Item_cond(List<Item> &nlist)
|
|
:Item_bool_func(), list(nlist), abort_on_null(0) {}
|
|
bool add(Item *item) { return list.push_back(item); }
|
|
void add_at_head(List<Item> *nlist) { list.prepand(nlist); }
|
|
bool fix_fields(THD *, Item **ref);
|
|
|
|
enum Type type() const { return COND_ITEM; }
|
|
List<Item>* argument_list() { return &list; }
|
|
table_map used_tables() const;
|
|
void update_used_tables();
|
|
void print(String *str);
|
|
void split_sum_func(THD *thd, Item **ref_pointer_array, List<Item> &fields);
|
|
friend int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves,
|
|
COND **conds);
|
|
void top_level_item() { abort_on_null=1; }
|
|
void copy_andor_arguments(THD *thd, Item_cond *item);
|
|
bool walk(Item_processor processor, bool walk_subquery, byte *arg);
|
|
Item *transform(Item_transformer transformer, byte *arg);
|
|
void traverse_cond(Cond_traverser, void *arg, traverse_order order);
|
|
void neg_arguments(THD *thd);
|
|
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
|
bool subst_argument_checker(byte **arg) { return TRUE; }
|
|
Item *compile(Item_analyzer analyzer, byte **arg_p,
|
|
Item_transformer transformer, byte *arg_t);
|
|
};
|
|
|
|
|
|
/*
|
|
The class Item_equal is used to represent conjunctions of equality
|
|
predicates of the form field1 = field2, and field=const in where
|
|
conditions and on expressions.
|
|
|
|
All equality predicates of the form field1=field2 contained in a
|
|
conjunction are substituted for a sequence of items of this class.
|
|
An item of this class Item_equal(f1,f2,...fk) represents a
|
|
multiple equality f1=f2=...=fk.
|
|
|
|
If a conjunction contains predicates f1=f2 and f2=f3, a new item of
|
|
this class is created Item_equal(f1,f2,f3) representing the multiple
|
|
equality f1=f2=f3 that substitutes the above equality predicates in
|
|
the conjunction.
|
|
A conjunction of the predicates f2=f1 and f3=f1 and f3=f2 will be
|
|
substituted for the item representing the same multiple equality
|
|
f1=f2=f3.
|
|
An item Item_equal(f1,f2) can appear instead of a conjunction of
|
|
f2=f1 and f1=f2, or instead of just the predicate f1=f2.
|
|
|
|
An item of the class Item_equal inherits equalities from outer
|
|
conjunctive levels.
|
|
|
|
Suppose we have a where condition of the following form:
|
|
WHERE f1=f2 AND f3=f4 AND f3=f5 AND ... AND (...OR (f1=f3 AND ...)).
|
|
In this case:
|
|
f1=f2 will be substituted for Item_equal(f1,f2);
|
|
f3=f4 and f3=f5 will be substituted for Item_equal(f3,f4,f5);
|
|
f1=f3 will be substituted for Item_equal(f1,f2,f3,f4,f5);
|
|
|
|
An object of the class Item_equal can contain an optional constant
|
|
item c. Then it represents a multiple equality of the form
|
|
c=f1=...=fk.
|
|
|
|
Objects of the class Item_equal are used for the following:
|
|
|
|
1. An object Item_equal(t1.f1,...,tk.fk) allows us to consider any
|
|
pair of tables ti and tj as joined by an equi-condition.
|
|
Thus it provide us with additional access paths from table to table.
|
|
|
|
2. An object Item_equal(t1.f1,...,tk.fk) is applied to deduce new
|
|
SARGable predicates:
|
|
f1=...=fk AND P(fi) => f1=...=fk AND P(fi) AND P(fj).
|
|
It also can give us additional index scans and can allow us to
|
|
improve selectivity estimates.
|
|
|
|
3. An object Item_equal(t1.f1,...,tk.fk) is used to optimize the
|
|
selected execution plan for the query: if table ti is accessed
|
|
before the table tj then in any predicate P in the where condition
|
|
the occurrence of tj.fj is substituted for ti.fi. This can allow
|
|
an evaluation of the predicate at an earlier step.
|
|
|
|
When feature 1 is supported they say that join transitive closure
|
|
is employed.
|
|
When feature 2 is supported they say that search argument transitive
|
|
closure is employed.
|
|
Both features are usually supported by preprocessing original query and
|
|
adding additional predicates.
|
|
We do not just add predicates, we rather dynamically replace some
|
|
predicates that can not be used to access tables in the investigated
|
|
plan for those, obtained by substitution of some fields for equal fields,
|
|
that can be used.
|
|
|
|
Prepared Statements/Stored Procedures note: instances of class
|
|
Item_equal are created only at the time a PS/SP is executed and
|
|
are deleted in the end of execution. All changes made to these
|
|
objects need not be registered in the list of changes of the parse
|
|
tree and do not harm PS/SP re-execution.
|
|
|
|
Item equal objects are employed only at the optimize phase. Usually they are
|
|
not supposed to be evaluated. Yet in some cases we call the method val_int()
|
|
for them. We have to take care of restricting the predicate such an
|
|
object represents f1=f2= ...=fn to the projection of known fields fi1=...=fik.
|
|
*/
|
|
|
|
class Item_equal: public Item_bool_func
|
|
{
|
|
List<Item_field> fields; /* list of equal field items */
|
|
Item *const_item; /* optional constant item equal to fields items */
|
|
cmp_item *eval_item;
|
|
bool cond_false;
|
|
DTCollation cmp_collation;
|
|
public:
|
|
inline Item_equal()
|
|
: Item_bool_func(), const_item(0), eval_item(0), cond_false(0)
|
|
{ const_item_cache=0 ;}
|
|
Item_equal(Item_field *f1, Item_field *f2);
|
|
Item_equal(Item *c, Item_field *f);
|
|
Item_equal(Item_equal *item_equal);
|
|
inline Item* get_const() { return const_item; }
|
|
void add(Item *c);
|
|
void add(Item_field *f);
|
|
uint members();
|
|
bool contains(Field *field);
|
|
Item_field* get_first() { return fields.head(); }
|
|
void merge(Item_equal *item);
|
|
void update_const();
|
|
enum Functype functype() const { return MULT_EQUAL_FUNC; }
|
|
longlong val_int();
|
|
const char *func_name() const { return "multiple equal"; }
|
|
optimize_type select_optimize() const { return OPTIMIZE_EQUAL; }
|
|
void sort(Item_field_cmpfunc cmp, void *arg);
|
|
friend class Item_equal_iterator;
|
|
void fix_length_and_dec();
|
|
bool fix_fields(THD *thd, Item **ref);
|
|
void update_used_tables();
|
|
bool walk(Item_processor processor, bool walk_subquery, byte *arg);
|
|
Item *transform(Item_transformer transformer, byte *arg);
|
|
void print(String *str);
|
|
CHARSET_INFO *compare_collation()
|
|
{ return fields.head()->collation.collation; }
|
|
};
|
|
|
|
class COND_EQUAL: public Sql_alloc
|
|
{
|
|
public:
|
|
uint max_members; /* max number of members the current level
|
|
list and all lower level lists */
|
|
COND_EQUAL *upper_levels; /* multiple equalities of upper and levels */
|
|
List<Item_equal> current_level; /* list of multiple equalities of
|
|
the current and level */
|
|
COND_EQUAL()
|
|
{
|
|
max_members= 0;
|
|
upper_levels= 0;
|
|
}
|
|
};
|
|
|
|
|
|
class Item_equal_iterator : public List_iterator_fast<Item_field>
|
|
{
|
|
public:
|
|
inline Item_equal_iterator(Item_equal &item_equal)
|
|
:List_iterator_fast<Item_field> (item_equal.fields)
|
|
{}
|
|
inline Item_field* operator++(int)
|
|
{
|
|
Item_field *item= (*(List_iterator_fast<Item_field> *) this)++;
|
|
return item;
|
|
}
|
|
inline void rewind(void)
|
|
{
|
|
List_iterator_fast<Item_field>::rewind();
|
|
}
|
|
};
|
|
|
|
class Item_cond_and :public Item_cond
|
|
{
|
|
public:
|
|
COND_EQUAL cond_equal; /* contains list of Item_equal objects for
|
|
the current and level and reference
|
|
to multiple equalities of upper and levels */
|
|
Item_cond_and() :Item_cond() {}
|
|
Item_cond_and(Item *i1,Item *i2) :Item_cond(i1,i2) {}
|
|
Item_cond_and(THD *thd, Item_cond_and *item) :Item_cond(thd, item) {}
|
|
Item_cond_and(List<Item> &list): Item_cond(list) {}
|
|
enum Functype functype() const { return COND_AND_FUNC; }
|
|
longlong val_int();
|
|
const char *func_name() const { return "and"; }
|
|
table_map not_null_tables() const
|
|
{ return abort_on_null ? not_null_tables_cache: and_tables_cache; }
|
|
Item* copy_andor_structure(THD *thd)
|
|
{
|
|
Item_cond_and *item;
|
|
if ((item= new Item_cond_and(thd, this)))
|
|
item->copy_andor_arguments(thd, this);
|
|
return item;
|
|
}
|
|
Item *neg_transformer(THD *thd);
|
|
};
|
|
|
|
class Item_cond_or :public Item_cond
|
|
{
|
|
public:
|
|
Item_cond_or() :Item_cond() {}
|
|
Item_cond_or(Item *i1,Item *i2) :Item_cond(i1,i2) {}
|
|
Item_cond_or(THD *thd, Item_cond_or *item) :Item_cond(thd, item) {}
|
|
Item_cond_or(List<Item> &list): Item_cond(list) {}
|
|
enum Functype functype() const { return COND_OR_FUNC; }
|
|
longlong val_int();
|
|
const char *func_name() const { return "or"; }
|
|
table_map not_null_tables() const { return and_tables_cache; }
|
|
Item* copy_andor_structure(THD *thd)
|
|
{
|
|
Item_cond_or *item;
|
|
if ((item= new Item_cond_or(thd, this)))
|
|
item->copy_andor_arguments(thd, this);
|
|
return item;
|
|
}
|
|
Item *neg_transformer(THD *thd);
|
|
};
|
|
|
|
|
|
/*
|
|
XOR is Item_cond, not an Item_int_func because we could like to
|
|
optimize (a XOR b) later on. It's low prio, though
|
|
*/
|
|
|
|
class Item_cond_xor :public Item_cond
|
|
{
|
|
public:
|
|
Item_cond_xor() :Item_cond() {}
|
|
Item_cond_xor(Item *i1,Item *i2) :Item_cond(i1,i2) {}
|
|
enum Functype functype() const { return COND_XOR_FUNC; }
|
|
/* TODO: remove the next line when implementing XOR optimization */
|
|
enum Type type() const { return FUNC_ITEM; }
|
|
longlong val_int();
|
|
const char *func_name() const { return "xor"; }
|
|
void top_level_item() {}
|
|
};
|
|
|
|
|
|
/* Some useful inline functions */
|
|
|
|
inline Item *and_conds(Item *a, Item *b)
|
|
{
|
|
if (!b) return a;
|
|
if (!a) return b;
|
|
return new Item_cond_and(a, b);
|
|
}
|
|
|
|
Item *and_expressions(Item *a, Item *b, Item **org_item);
|