mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 07:14:17 +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
1942 lines
42 KiB
C++
1942 lines
42 KiB
C++
/* Copyright (C) 2004 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "mysql_priv.h"
|
|
|
|
#ifdef HAVE_SPATIAL
|
|
|
|
#define MAX_DIGITS_IN_DOUBLE 16
|
|
|
|
/***************************** Gis_class_info *******************************/
|
|
|
|
String Geometry::bad_geometry_data("Bad object", &my_charset_bin);
|
|
|
|
Geometry::Class_info *Geometry::ci_collection[Geometry::wkb_end+1]=
|
|
{
|
|
NULL, NULL, NULL, NULL, NULL, NULL, NULL
|
|
};
|
|
|
|
static Geometry::Class_info **ci_collection_end=
|
|
Geometry::ci_collection+Geometry::wkb_end + 1;
|
|
|
|
Geometry::Class_info::Class_info(const char *name, int type_id,
|
|
void(*create_func)(void *)):
|
|
m_type_id(type_id), m_create_func(create_func)
|
|
{
|
|
m_name.str= (char *) name;
|
|
m_name.length= strlen(name);
|
|
|
|
ci_collection[type_id]= this;
|
|
}
|
|
|
|
static void create_point(void *buffer)
|
|
{
|
|
new(buffer) Gis_point;
|
|
}
|
|
|
|
static void create_linestring(void *buffer)
|
|
{
|
|
new(buffer) Gis_line_string;
|
|
}
|
|
|
|
static void create_polygon(void *buffer)
|
|
{
|
|
new(buffer) Gis_polygon;
|
|
}
|
|
|
|
static void create_multipoint(void *buffer)
|
|
{
|
|
new(buffer) Gis_multi_point;
|
|
}
|
|
|
|
static void create_multipolygon(void *buffer)
|
|
{
|
|
new(buffer) Gis_multi_polygon;
|
|
}
|
|
|
|
static void create_multilinestring(void *buffer)
|
|
{
|
|
new(buffer) Gis_multi_line_string;
|
|
}
|
|
|
|
static void create_geometrycollection(void *buffer)
|
|
{
|
|
new(buffer) Gis_geometry_collection;
|
|
}
|
|
|
|
|
|
|
|
static Geometry::Class_info point_class("POINT",
|
|
Geometry::wkb_point, create_point);
|
|
|
|
static Geometry::Class_info linestring_class("LINESTRING",
|
|
Geometry::wkb_linestring,
|
|
create_linestring);
|
|
static Geometry::Class_info polygon_class("POLYGON",
|
|
Geometry::wkb_polygon,
|
|
create_polygon);
|
|
static Geometry::Class_info multipoint_class("MULTIPOINT",
|
|
Geometry::wkb_multipoint,
|
|
create_multipoint);
|
|
static Geometry::Class_info
|
|
multilinestring_class("MULTILINESTRING",
|
|
Geometry::wkb_multilinestring, create_multilinestring);
|
|
static Geometry::Class_info multipolygon_class("MULTIPOLYGON",
|
|
Geometry::wkb_multipolygon,
|
|
create_multipolygon);
|
|
static Geometry::Class_info
|
|
geometrycollection_class("GEOMETRYCOLLECTION",Geometry::wkb_geometrycollection,
|
|
create_geometrycollection);
|
|
|
|
static void get_point(double *x, double *y, const char *data)
|
|
{
|
|
float8get(*x, data);
|
|
float8get(*y, data + SIZEOF_STORED_DOUBLE);
|
|
}
|
|
|
|
/***************************** Geometry *******************************/
|
|
|
|
Geometry::Class_info *Geometry::find_class(const char *name, uint32 len)
|
|
{
|
|
for (Class_info **cur_rt= ci_collection;
|
|
cur_rt < ci_collection_end; cur_rt++)
|
|
{
|
|
if (*cur_rt &&
|
|
((*cur_rt)->m_name.length == len) &&
|
|
(my_strnncoll(&my_charset_latin1,
|
|
(const uchar*) (*cur_rt)->m_name.str, len,
|
|
(const uchar*) name, len) == 0))
|
|
return *cur_rt;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
Geometry *Geometry::construct(Geometry_buffer *buffer,
|
|
const char *data, uint32 data_len)
|
|
{
|
|
uint32 geom_type;
|
|
Geometry *result;
|
|
char byte_order;
|
|
|
|
if (data_len < SRID_SIZE + WKB_HEADER_SIZE) // < 4 + (1 + 4)
|
|
return NULL;
|
|
byte_order= data[SRID_SIZE];
|
|
geom_type= uint4korr(data + SRID_SIZE + 1);
|
|
if (!(result= create_by_typeid(buffer, (int) geom_type)))
|
|
return NULL;
|
|
result->m_data= data+ SRID_SIZE + WKB_HEADER_SIZE;
|
|
result->m_data_end= data + data_len;
|
|
return result;
|
|
}
|
|
|
|
|
|
Geometry *Geometry::create_from_wkt(Geometry_buffer *buffer,
|
|
Gis_read_stream *trs, String *wkt,
|
|
bool init_stream)
|
|
{
|
|
LEX_STRING name;
|
|
Class_info *ci;
|
|
|
|
if (trs->get_next_word(&name))
|
|
{
|
|
trs->set_error_msg("Geometry name expected");
|
|
return NULL;
|
|
}
|
|
if (!(ci= find_class(name.str, name.length)) ||
|
|
wkt->reserve(1 + 4, 512))
|
|
return NULL;
|
|
(*ci->m_create_func)((void *)buffer);
|
|
Geometry *result= (Geometry *)buffer;
|
|
|
|
wkt->q_append((char) wkb_ndr);
|
|
wkt->q_append((uint32) result->get_class_info()->m_type_id);
|
|
if (trs->check_next_symbol('(') ||
|
|
result->init_from_wkt(trs, wkt) ||
|
|
trs->check_next_symbol(')'))
|
|
return NULL;
|
|
if (init_stream)
|
|
{
|
|
result->set_data_ptr(wkt->ptr(), wkt->length());
|
|
result->shift_wkb_header();
|
|
}
|
|
return result;
|
|
}
|
|
|
|
|
|
static double wkb_get_double(const char *ptr, Geometry::wkbByteOrder bo)
|
|
{
|
|
double res;
|
|
if (bo != Geometry::wkb_xdr)
|
|
{
|
|
float8get(res, ptr);
|
|
}
|
|
else
|
|
{
|
|
char inv_array[8];
|
|
inv_array[0]= ptr[7];
|
|
inv_array[1]= ptr[6];
|
|
inv_array[2]= ptr[5];
|
|
inv_array[3]= ptr[4];
|
|
inv_array[4]= ptr[3];
|
|
inv_array[5]= ptr[2];
|
|
inv_array[6]= ptr[1];
|
|
inv_array[7]= ptr[0];
|
|
float8get(res, inv_array);
|
|
}
|
|
return res;
|
|
}
|
|
|
|
|
|
static uint32 wkb_get_uint(const char *ptr, Geometry::wkbByteOrder bo)
|
|
{
|
|
if (bo != Geometry::wkb_xdr)
|
|
return uint4korr(ptr);
|
|
/* else */
|
|
{
|
|
char inv_array[4];
|
|
inv_array[0]= ptr[3];
|
|
inv_array[1]= ptr[2];
|
|
inv_array[2]= ptr[1];
|
|
inv_array[3]= ptr[0];
|
|
return uint4korr(inv_array);
|
|
}
|
|
}
|
|
|
|
|
|
int Geometry::create_from_wkb(Geometry_buffer *buffer,
|
|
const char *wkb, uint32 len, String *res)
|
|
{
|
|
uint32 geom_type;
|
|
Geometry *geom;
|
|
|
|
if (len < WKB_HEADER_SIZE)
|
|
return 1;
|
|
geom_type= wkb_get_uint(wkb+1, (wkbByteOrder)wkb[0]);
|
|
if (!(geom= create_by_typeid(buffer, (int) geom_type)) ||
|
|
res->reserve(WKB_HEADER_SIZE, 512))
|
|
return 1;
|
|
|
|
res->q_append((char) wkb_ndr);
|
|
res->q_append(geom_type);
|
|
return geom->init_from_wkb(wkb+WKB_HEADER_SIZE, len - WKB_HEADER_SIZE,
|
|
(wkbByteOrder) wkb[0], res);
|
|
}
|
|
|
|
|
|
bool Geometry::envelope(String *result) const
|
|
{
|
|
MBR mbr;
|
|
const char *end;
|
|
|
|
if (get_mbr(&mbr, &end) || result->reserve(1+4*3+SIZEOF_STORED_DOUBLE*10))
|
|
return 1;
|
|
|
|
result->q_append((char) wkb_ndr);
|
|
result->q_append((uint32) wkb_polygon);
|
|
result->q_append((uint32) 1);
|
|
result->q_append((uint32) 5);
|
|
result->q_append(mbr.xmin);
|
|
result->q_append(mbr.ymin);
|
|
result->q_append(mbr.xmax);
|
|
result->q_append(mbr.ymin);
|
|
result->q_append(mbr.xmax);
|
|
result->q_append(mbr.ymax);
|
|
result->q_append(mbr.xmin);
|
|
result->q_append(mbr.ymax);
|
|
result->q_append(mbr.xmin);
|
|
result->q_append(mbr.ymin);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Create a point from data.
|
|
|
|
SYNPOSIS
|
|
create_point()
|
|
result Put result here
|
|
data Data for point is here.
|
|
|
|
RETURN
|
|
0 ok
|
|
1 Can't reallocate 'result'
|
|
*/
|
|
|
|
bool Geometry::create_point(String *result, const char *data) const
|
|
{
|
|
if (no_data(data, SIZEOF_STORED_DOUBLE * 2) ||
|
|
result->reserve(1 + 4 + SIZEOF_STORED_DOUBLE * 2))
|
|
return 1;
|
|
result->q_append((char) wkb_ndr);
|
|
result->q_append((uint32) wkb_point);
|
|
/* Copy two double in same format */
|
|
result->q_append(data, SIZEOF_STORED_DOUBLE*2);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
Create a point from coordinates.
|
|
|
|
SYNPOSIS
|
|
create_point()
|
|
result Put result here
|
|
x x coordinate for point
|
|
y y coordinate for point
|
|
|
|
RETURN
|
|
0 ok
|
|
1 Can't reallocate 'result'
|
|
*/
|
|
|
|
bool Geometry::create_point(String *result, double x, double y) const
|
|
{
|
|
if (result->reserve(1 + 4 + SIZEOF_STORED_DOUBLE * 2))
|
|
return 1;
|
|
|
|
result->q_append((char) wkb_ndr);
|
|
result->q_append((uint32) wkb_point);
|
|
result->q_append(x);
|
|
result->q_append(y);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
Append N points from packed format to text
|
|
|
|
SYNOPSIS
|
|
append_points()
|
|
txt Append points here
|
|
n_points Number of points
|
|
data Packed data
|
|
offset Offset between points
|
|
|
|
RETURN
|
|
# end of data
|
|
*/
|
|
|
|
const char *Geometry::append_points(String *txt, uint32 n_points,
|
|
const char *data, uint32 offset) const
|
|
{
|
|
while (n_points--)
|
|
{
|
|
double x,y;
|
|
data+= offset;
|
|
get_point(&x, &y, data);
|
|
data+= SIZEOF_STORED_DOUBLE * 2;
|
|
txt->qs_append(x);
|
|
txt->qs_append(' ');
|
|
txt->qs_append(y);
|
|
txt->qs_append(',');
|
|
}
|
|
return data;
|
|
}
|
|
|
|
|
|
/*
|
|
Get most bounding rectangle (mbr) for X points
|
|
|
|
SYNOPSIS
|
|
get_mbr_for_points()
|
|
mbr MBR (store rectangle here)
|
|
points Number of points
|
|
data Packed data
|
|
offset Offset between points
|
|
|
|
RETURN
|
|
0 Wrong data
|
|
# end of data
|
|
*/
|
|
|
|
const char *Geometry::get_mbr_for_points(MBR *mbr, const char *data,
|
|
uint offset) const
|
|
{
|
|
uint32 points;
|
|
/* read number of points */
|
|
if (no_data(data, 4))
|
|
return 0;
|
|
points= uint4korr(data);
|
|
data+= 4;
|
|
|
|
if (no_data(data, (SIZEOF_STORED_DOUBLE * 2 + offset) * points))
|
|
return 0;
|
|
|
|
/* Calculate MBR for points */
|
|
while (points--)
|
|
{
|
|
data+= offset;
|
|
mbr->add_xy(data, data + SIZEOF_STORED_DOUBLE);
|
|
data+= SIZEOF_STORED_DOUBLE * 2;
|
|
}
|
|
return data;
|
|
}
|
|
|
|
|
|
/***************************** Point *******************************/
|
|
|
|
uint32 Gis_point::get_data_size() const
|
|
{
|
|
return POINT_DATA_SIZE;
|
|
}
|
|
|
|
|
|
bool Gis_point::init_from_wkt(Gis_read_stream *trs, String *wkb)
|
|
{
|
|
double x, y;
|
|
if (trs->get_next_number(&x) || trs->get_next_number(&y) ||
|
|
wkb->reserve(SIZEOF_STORED_DOUBLE * 2))
|
|
return 1;
|
|
wkb->q_append(x);
|
|
wkb->q_append(y);
|
|
return 0;
|
|
}
|
|
|
|
|
|
uint Gis_point::init_from_wkb(const char *wkb, uint len,
|
|
wkbByteOrder bo, String *res)
|
|
{
|
|
double x, y;
|
|
if (len < POINT_DATA_SIZE || res->reserve(POINT_DATA_SIZE))
|
|
return 0;
|
|
x= wkb_get_double(wkb, bo);
|
|
y= wkb_get_double(wkb + SIZEOF_STORED_DOUBLE, bo);
|
|
res->q_append(x);
|
|
res->q_append(y);
|
|
return POINT_DATA_SIZE;
|
|
}
|
|
|
|
|
|
bool Gis_point::get_data_as_wkt(String *txt, const char **end) const
|
|
{
|
|
double x, y;
|
|
if (get_xy(&x, &y))
|
|
return 1;
|
|
if (txt->reserve(MAX_DIGITS_IN_DOUBLE * 2 + 1))
|
|
return 1;
|
|
txt->qs_append(x);
|
|
txt->qs_append(' ');
|
|
txt->qs_append(y);
|
|
*end= m_data+ POINT_DATA_SIZE;
|
|
return 0;
|
|
}
|
|
|
|
|
|
bool Gis_point::get_mbr(MBR *mbr, const char **end) const
|
|
{
|
|
double x, y;
|
|
if (get_xy(&x, &y))
|
|
return 1;
|
|
mbr->add_xy(x, y);
|
|
*end= m_data+ POINT_DATA_SIZE;
|
|
return 0;
|
|
}
|
|
|
|
const Geometry::Class_info *Gis_point::get_class_info() const
|
|
{
|
|
return &point_class;
|
|
}
|
|
|
|
|
|
/***************************** LineString *******************************/
|
|
|
|
uint32 Gis_line_string::get_data_size() const
|
|
{
|
|
if (no_data(m_data, 4))
|
|
return GET_SIZE_ERROR;
|
|
return 4 + uint4korr(m_data) * POINT_DATA_SIZE;
|
|
}
|
|
|
|
|
|
bool Gis_line_string::init_from_wkt(Gis_read_stream *trs, String *wkb)
|
|
{
|
|
uint32 n_points= 0;
|
|
uint32 np_pos= wkb->length();
|
|
Gis_point p;
|
|
|
|
if (wkb->reserve(4, 512))
|
|
return 1;
|
|
wkb->length(wkb->length()+4); // Reserve space for points
|
|
|
|
for (;;)
|
|
{
|
|
if (p.init_from_wkt(trs, wkb))
|
|
return 1;
|
|
n_points++;
|
|
if (trs->skip_char(',')) // Didn't find ','
|
|
break;
|
|
}
|
|
if (n_points < 1)
|
|
{
|
|
trs->set_error_msg("Too few points in LINESTRING");
|
|
return 1;
|
|
}
|
|
wkb->write_at_position(np_pos, n_points);
|
|
return 0;
|
|
}
|
|
|
|
|
|
uint Gis_line_string::init_from_wkb(const char *wkb, uint len,
|
|
wkbByteOrder bo, String *res)
|
|
{
|
|
uint32 n_points, proper_length;
|
|
const char *wkb_end;
|
|
Gis_point p;
|
|
|
|
if (len < 4)
|
|
return 0;
|
|
n_points= wkb_get_uint(wkb, bo);
|
|
proper_length= 4 + n_points * POINT_DATA_SIZE;
|
|
|
|
if (len < proper_length || res->reserve(proper_length))
|
|
return 0;
|
|
|
|
res->q_append(n_points);
|
|
wkb_end= wkb + proper_length;
|
|
for (wkb+= 4; wkb<wkb_end; wkb+= POINT_DATA_SIZE)
|
|
{
|
|
if (!p.init_from_wkb(wkb, POINT_DATA_SIZE, bo, res))
|
|
return 0;
|
|
}
|
|
|
|
return proper_length;
|
|
}
|
|
|
|
|
|
bool Gis_line_string::get_data_as_wkt(String *txt, const char **end) const
|
|
{
|
|
uint32 n_points;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_points= uint4korr(data);
|
|
data += 4;
|
|
|
|
if (n_points < 1 ||
|
|
no_data(data, SIZEOF_STORED_DOUBLE * 2 * n_points) ||
|
|
txt->reserve(((MAX_DIGITS_IN_DOUBLE + 1)*2 + 1) * n_points))
|
|
return 1;
|
|
|
|
while (n_points--)
|
|
{
|
|
double x, y;
|
|
get_point(&x, &y, data);
|
|
data+= SIZEOF_STORED_DOUBLE * 2;
|
|
txt->qs_append(x);
|
|
txt->qs_append(' ');
|
|
txt->qs_append(y);
|
|
txt->qs_append(',');
|
|
}
|
|
txt->length(txt->length() - 1); // Remove end ','
|
|
*end= data;
|
|
return 0;
|
|
}
|
|
|
|
|
|
bool Gis_line_string::get_mbr(MBR *mbr, const char **end) const
|
|
{
|
|
return (*end=get_mbr_for_points(mbr, m_data, 0)) == 0;
|
|
}
|
|
|
|
|
|
int Gis_line_string::length(double *len) const
|
|
{
|
|
uint32 n_points;
|
|
double prev_x, prev_y;
|
|
const char *data= m_data;
|
|
|
|
*len= 0; // In case of errors
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_points= uint4korr(data);
|
|
data+= 4;
|
|
if (n_points < 1 || no_data(data, SIZEOF_STORED_DOUBLE * 2 * n_points))
|
|
return 1;
|
|
|
|
get_point(&prev_x, &prev_y, data);
|
|
data+= SIZEOF_STORED_DOUBLE*2;
|
|
|
|
while (--n_points)
|
|
{
|
|
double x, y;
|
|
get_point(&x, &y, data);
|
|
data+= SIZEOF_STORED_DOUBLE * 2;
|
|
*len+= sqrt(pow(prev_x-x,2)+pow(prev_y-y,2));
|
|
prev_x= x;
|
|
prev_y= y;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_line_string::is_closed(int *closed) const
|
|
{
|
|
uint32 n_points;
|
|
double x1, y1, x2, y2;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_points= uint4korr(data);
|
|
if (n_points == 1)
|
|
{
|
|
*closed=1;
|
|
return 0;
|
|
}
|
|
data+= 4;
|
|
if (no_data(data, SIZEOF_STORED_DOUBLE * 2 * n_points))
|
|
return 1;
|
|
|
|
/* Get first point */
|
|
get_point(&x1, &y1, data);
|
|
|
|
/* get last point */
|
|
data+= SIZEOF_STORED_DOUBLE*2 + (n_points-2)*POINT_DATA_SIZE;
|
|
get_point(&x2, &y2, data);
|
|
|
|
*closed= (x1==x2) && (y1==y2);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_line_string::num_points(uint32 *n_points) const
|
|
{
|
|
*n_points= uint4korr(m_data);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_line_string::start_point(String *result) const
|
|
{
|
|
/* +4 is for skipping over number of points */
|
|
return create_point(result, m_data + 4);
|
|
}
|
|
|
|
|
|
int Gis_line_string::end_point(String *result) const
|
|
{
|
|
uint32 n_points;
|
|
if (no_data(m_data, 4))
|
|
return 1;
|
|
n_points= uint4korr(m_data);
|
|
return create_point(result, m_data + 4 + (n_points - 1) * POINT_DATA_SIZE);
|
|
}
|
|
|
|
|
|
int Gis_line_string::point_n(uint32 num, String *result) const
|
|
{
|
|
uint32 n_points;
|
|
if (no_data(m_data, 4))
|
|
return 1;
|
|
n_points= uint4korr(m_data);
|
|
if ((uint32) (num - 1) >= n_points) // means (num > n_points || num < 1)
|
|
return 1;
|
|
|
|
return create_point(result, m_data + 4 + (num - 1) * POINT_DATA_SIZE);
|
|
}
|
|
|
|
const Geometry::Class_info *Gis_line_string::get_class_info() const
|
|
{
|
|
return &linestring_class;
|
|
}
|
|
|
|
|
|
/***************************** Polygon *******************************/
|
|
|
|
uint32 Gis_polygon::get_data_size() const
|
|
{
|
|
uint32 n_linear_rings;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return GET_SIZE_ERROR;
|
|
n_linear_rings= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_linear_rings--)
|
|
{
|
|
if (no_data(data, 4))
|
|
return GET_SIZE_ERROR;
|
|
data+= 4 + uint4korr(data)*POINT_DATA_SIZE;
|
|
}
|
|
return (uint32) (data - m_data);
|
|
}
|
|
|
|
|
|
bool Gis_polygon::init_from_wkt(Gis_read_stream *trs, String *wkb)
|
|
{
|
|
uint32 n_linear_rings= 0;
|
|
uint32 lr_pos= wkb->length();
|
|
int closed;
|
|
|
|
if (wkb->reserve(4, 512))
|
|
return 1;
|
|
wkb->length(wkb->length()+4); // Reserve space for points
|
|
for (;;)
|
|
{
|
|
Gis_line_string ls;
|
|
uint32 ls_pos=wkb->length();
|
|
if (trs->check_next_symbol('(') ||
|
|
ls.init_from_wkt(trs, wkb) ||
|
|
trs->check_next_symbol(')'))
|
|
return 1;
|
|
|
|
ls.set_data_ptr(wkb->ptr() + ls_pos, wkb->length() - ls_pos);
|
|
if (ls.is_closed(&closed) || !closed)
|
|
{
|
|
trs->set_error_msg("POLYGON's linear ring isn't closed");
|
|
return 1;
|
|
}
|
|
n_linear_rings++;
|
|
if (trs->skip_char(',')) // Didn't find ','
|
|
break;
|
|
}
|
|
wkb->write_at_position(lr_pos, n_linear_rings);
|
|
return 0;
|
|
}
|
|
|
|
|
|
uint Gis_polygon::init_from_wkb(const char *wkb, uint len, wkbByteOrder bo,
|
|
String *res)
|
|
{
|
|
uint32 n_linear_rings;
|
|
const char *wkb_orig= wkb;
|
|
|
|
if (len < 4)
|
|
return 0;
|
|
|
|
n_linear_rings= wkb_get_uint(wkb, bo);
|
|
if (res->reserve(4, 512))
|
|
return 0;
|
|
wkb+= 4;
|
|
len-= 4;
|
|
res->q_append(n_linear_rings);
|
|
|
|
while (n_linear_rings--)
|
|
{
|
|
Gis_line_string ls;
|
|
uint32 ls_pos= res->length();
|
|
int ls_len;
|
|
int closed;
|
|
|
|
if (!(ls_len= ls.init_from_wkb(wkb, len, bo, res)))
|
|
return 0;
|
|
|
|
ls.set_data_ptr(res->ptr() + ls_pos, res->length() - ls_pos);
|
|
|
|
if (ls.is_closed(&closed) || !closed)
|
|
return 0;
|
|
wkb+= ls_len;
|
|
}
|
|
|
|
return (uint) (wkb - wkb_orig);
|
|
}
|
|
|
|
|
|
bool Gis_polygon::get_data_as_wkt(String *txt, const char **end) const
|
|
{
|
|
uint32 n_linear_rings;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
|
|
n_linear_rings= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_linear_rings--)
|
|
{
|
|
uint32 n_points;
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_points= uint4korr(data);
|
|
data+= 4;
|
|
if (no_data(data, (SIZEOF_STORED_DOUBLE*2) * n_points) ||
|
|
txt->reserve(2 + ((MAX_DIGITS_IN_DOUBLE + 1) * 2 + 1) * n_points))
|
|
return 1;
|
|
txt->qs_append('(');
|
|
data= append_points(txt, n_points, data, 0);
|
|
(*txt) [txt->length() - 1]= ')'; // Replace end ','
|
|
txt->qs_append(',');
|
|
}
|
|
txt->length(txt->length() - 1); // Remove end ','
|
|
*end= data;
|
|
return 0;
|
|
}
|
|
|
|
|
|
bool Gis_polygon::get_mbr(MBR *mbr, const char **end) const
|
|
{
|
|
uint32 n_linear_rings;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_linear_rings= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_linear_rings--)
|
|
{
|
|
if (!(data= get_mbr_for_points(mbr, data, 0)))
|
|
return 1;
|
|
}
|
|
*end= data;
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_polygon::area(double *ar, const char **end_of_data) const
|
|
{
|
|
uint32 n_linear_rings;
|
|
double result= -1.0;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_linear_rings= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_linear_rings--)
|
|
{
|
|
double prev_x, prev_y;
|
|
double lr_area= 0;
|
|
uint32 n_points;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_points= uint4korr(data);
|
|
if (no_data(data, (SIZEOF_STORED_DOUBLE*2) * n_points))
|
|
return 1;
|
|
get_point(&prev_x, &prev_y, data+4);
|
|
data+= (4+SIZEOF_STORED_DOUBLE*2);
|
|
|
|
while (--n_points) // One point is already read
|
|
{
|
|
double x, y;
|
|
get_point(&x, &y, data);
|
|
data+= (SIZEOF_STORED_DOUBLE*2);
|
|
lr_area+= (prev_x + x)* (prev_y - y);
|
|
prev_x= x;
|
|
prev_y= y;
|
|
}
|
|
lr_area= fabs(lr_area)/2;
|
|
if (result == -1.0)
|
|
result= lr_area;
|
|
else
|
|
result-= lr_area;
|
|
}
|
|
*ar= fabs(result);
|
|
*end_of_data= data;
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_polygon::exterior_ring(String *result) const
|
|
{
|
|
uint32 n_points, length;
|
|
const char *data= m_data + 4; // skip n_linerings
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_points= uint4korr(data);
|
|
data+= 4;
|
|
length= n_points * POINT_DATA_SIZE;
|
|
if (no_data(data, length) || result->reserve(1+4+4+ length))
|
|
return 1;
|
|
|
|
result->q_append((char) wkb_ndr);
|
|
result->q_append((uint32) wkb_linestring);
|
|
result->q_append(n_points);
|
|
result->q_append(data, n_points * POINT_DATA_SIZE);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_polygon::num_interior_ring(uint32 *n_int_rings) const
|
|
{
|
|
if (no_data(m_data, 4))
|
|
return 1;
|
|
*n_int_rings= uint4korr(m_data)-1;
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_polygon::interior_ring_n(uint32 num, String *result) const
|
|
{
|
|
const char *data= m_data;
|
|
uint32 n_linear_rings;
|
|
uint32 n_points;
|
|
uint32 points_size;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_linear_rings= uint4korr(data);
|
|
data+= 4;
|
|
|
|
if (num >= n_linear_rings || num < 1)
|
|
return 1;
|
|
|
|
while (num--)
|
|
{
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
data+= 4 + uint4korr(data) * POINT_DATA_SIZE;
|
|
}
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_points= uint4korr(data);
|
|
points_size= n_points * POINT_DATA_SIZE;
|
|
data+= 4;
|
|
if (no_data(data, points_size) || result->reserve(1+4+4+ points_size))
|
|
return 1;
|
|
|
|
result->q_append((char) wkb_ndr);
|
|
result->q_append((uint32) wkb_linestring);
|
|
result->q_append(n_points);
|
|
result->q_append(data, points_size);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_polygon::centroid_xy(double *x, double *y) const
|
|
{
|
|
uint32 n_linear_rings;
|
|
double res_area;
|
|
double res_cx, res_cy;
|
|
const char *data= m_data;
|
|
bool first_loop= 1;
|
|
LINT_INIT(res_area);
|
|
LINT_INIT(res_cx);
|
|
LINT_INIT(res_cy);
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_linear_rings= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_linear_rings--)
|
|
{
|
|
uint32 n_points, org_n_points;
|
|
double prev_x, prev_y;
|
|
double cur_area= 0;
|
|
double cur_cx= 0;
|
|
double cur_cy= 0;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
org_n_points= n_points= uint4korr(data);
|
|
data+= 4;
|
|
if (no_data(data, (SIZEOF_STORED_DOUBLE*2) * n_points))
|
|
return 1;
|
|
get_point(&prev_x, &prev_y, data);
|
|
data+= (SIZEOF_STORED_DOUBLE*2);
|
|
|
|
while (--n_points) // One point is already read
|
|
{
|
|
double x, y;
|
|
get_point(&x, &y, data);
|
|
data+= (SIZEOF_STORED_DOUBLE*2);
|
|
cur_area+= (prev_x + x) * (prev_y - y);
|
|
cur_cx+= x;
|
|
cur_cy+= y;
|
|
prev_x= x;
|
|
prev_y= y;
|
|
}
|
|
cur_area= fabs(cur_area) / 2;
|
|
cur_cx= cur_cx / (org_n_points - 1);
|
|
cur_cy= cur_cy / (org_n_points - 1);
|
|
|
|
if (!first_loop)
|
|
{
|
|
double d_area= fabs(res_area - cur_area);
|
|
res_cx= (res_area * res_cx - cur_area * cur_cx) / d_area;
|
|
res_cy= (res_area * res_cy - cur_area * cur_cy) / d_area;
|
|
}
|
|
else
|
|
{
|
|
first_loop= 0;
|
|
res_area= cur_area;
|
|
res_cx= cur_cx;
|
|
res_cy= cur_cy;
|
|
}
|
|
}
|
|
|
|
*x= res_cx;
|
|
*y= res_cy;
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_polygon::centroid(String *result) const
|
|
{
|
|
double x, y;
|
|
if (centroid_xy(&x, &y))
|
|
return 1;
|
|
return create_point(result, x, y);
|
|
}
|
|
|
|
const Geometry::Class_info *Gis_polygon::get_class_info() const
|
|
{
|
|
return &polygon_class;
|
|
}
|
|
|
|
|
|
/***************************** MultiPoint *******************************/
|
|
|
|
uint32 Gis_multi_point::get_data_size() const
|
|
{
|
|
if (no_data(m_data, 4))
|
|
return GET_SIZE_ERROR;
|
|
return 4 + uint4korr(m_data)*(POINT_DATA_SIZE + WKB_HEADER_SIZE);
|
|
}
|
|
|
|
|
|
bool Gis_multi_point::init_from_wkt(Gis_read_stream *trs, String *wkb)
|
|
{
|
|
uint32 n_points= 0;
|
|
uint32 np_pos= wkb->length();
|
|
Gis_point p;
|
|
|
|
if (wkb->reserve(4, 512))
|
|
return 1;
|
|
wkb->length(wkb->length()+4); // Reserve space for points
|
|
|
|
for (;;)
|
|
{
|
|
if (wkb->reserve(1+4, 512))
|
|
return 1;
|
|
wkb->q_append((char) wkb_ndr);
|
|
wkb->q_append((uint32) wkb_point);
|
|
if (p.init_from_wkt(trs, wkb))
|
|
return 1;
|
|
n_points++;
|
|
if (trs->skip_char(',')) // Didn't find ','
|
|
break;
|
|
}
|
|
wkb->write_at_position(np_pos, n_points); // Store number of found points
|
|
return 0;
|
|
}
|
|
|
|
|
|
uint Gis_multi_point::init_from_wkb(const char *wkb, uint len, wkbByteOrder bo,
|
|
String *res)
|
|
{
|
|
uint32 n_points;
|
|
uint proper_size;
|
|
Gis_point p;
|
|
const char *wkb_end;
|
|
|
|
if (len < 4)
|
|
return 0;
|
|
n_points= wkb_get_uint(wkb, bo);
|
|
proper_size= 4 + n_points * (WKB_HEADER_SIZE + POINT_DATA_SIZE);
|
|
|
|
if (len < proper_size || res->reserve(proper_size))
|
|
return 0;
|
|
|
|
res->q_append(n_points);
|
|
wkb_end= wkb + proper_size;
|
|
for (wkb+=4; wkb < wkb_end; wkb+= (WKB_HEADER_SIZE + POINT_DATA_SIZE))
|
|
{
|
|
res->q_append((char)wkb_ndr);
|
|
res->q_append((uint32)wkb_point);
|
|
if (!p.init_from_wkb(wkb + WKB_HEADER_SIZE,
|
|
POINT_DATA_SIZE, (wkbByteOrder) wkb[0], res))
|
|
return 0;
|
|
}
|
|
return proper_size;
|
|
}
|
|
|
|
|
|
bool Gis_multi_point::get_data_as_wkt(String *txt, const char **end) const
|
|
{
|
|
uint32 n_points;
|
|
if (no_data(m_data, 4))
|
|
return 1;
|
|
|
|
n_points= uint4korr(m_data);
|
|
if (no_data(m_data+4,
|
|
n_points * (SIZEOF_STORED_DOUBLE * 2 + WKB_HEADER_SIZE)) ||
|
|
txt->reserve(((MAX_DIGITS_IN_DOUBLE + 1) * 2 + 1) * n_points))
|
|
return 1;
|
|
*end= append_points(txt, n_points, m_data+4, WKB_HEADER_SIZE);
|
|
txt->length(txt->length()-1); // Remove end ','
|
|
return 0;
|
|
}
|
|
|
|
|
|
bool Gis_multi_point::get_mbr(MBR *mbr, const char **end) const
|
|
{
|
|
return (*end= get_mbr_for_points(mbr, m_data, WKB_HEADER_SIZE)) == 0;
|
|
}
|
|
|
|
|
|
int Gis_multi_point::num_geometries(uint32 *num) const
|
|
{
|
|
*num= uint4korr(m_data);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_multi_point::geometry_n(uint32 num, String *result) const
|
|
{
|
|
const char *data= m_data;
|
|
uint32 n_points;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_points= uint4korr(data);
|
|
data+= 4+ (num - 1) * (WKB_HEADER_SIZE + POINT_DATA_SIZE);
|
|
|
|
if (num > n_points || num < 1 ||
|
|
no_data(data, WKB_HEADER_SIZE + POINT_DATA_SIZE) ||
|
|
result->reserve(WKB_HEADER_SIZE + POINT_DATA_SIZE))
|
|
return 1;
|
|
|
|
result->q_append(data, WKB_HEADER_SIZE + POINT_DATA_SIZE);
|
|
return 0;
|
|
}
|
|
|
|
const Geometry::Class_info *Gis_multi_point::get_class_info() const
|
|
{
|
|
return &multipoint_class;
|
|
}
|
|
|
|
|
|
/***************************** MultiLineString *******************************/
|
|
|
|
uint32 Gis_multi_line_string::get_data_size() const
|
|
{
|
|
uint32 n_line_strings;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return GET_SIZE_ERROR;
|
|
n_line_strings= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_line_strings--)
|
|
{
|
|
if (no_data(data, WKB_HEADER_SIZE + 4))
|
|
return GET_SIZE_ERROR;
|
|
data+= (WKB_HEADER_SIZE + 4 + uint4korr(data + WKB_HEADER_SIZE) *
|
|
POINT_DATA_SIZE);
|
|
}
|
|
return (uint32) (data - m_data);
|
|
}
|
|
|
|
|
|
bool Gis_multi_line_string::init_from_wkt(Gis_read_stream *trs, String *wkb)
|
|
{
|
|
uint32 n_line_strings= 0;
|
|
uint32 ls_pos= wkb->length();
|
|
|
|
if (wkb->reserve(4, 512))
|
|
return 1;
|
|
wkb->length(wkb->length()+4); // Reserve space for points
|
|
|
|
for (;;)
|
|
{
|
|
Gis_line_string ls;
|
|
|
|
if (wkb->reserve(1+4, 512))
|
|
return 1;
|
|
wkb->q_append((char) wkb_ndr);
|
|
wkb->q_append((uint32) wkb_linestring);
|
|
|
|
if (trs->check_next_symbol('(') ||
|
|
ls.init_from_wkt(trs, wkb) ||
|
|
trs->check_next_symbol(')'))
|
|
return 1;
|
|
n_line_strings++;
|
|
if (trs->skip_char(',')) // Didn't find ','
|
|
break;
|
|
}
|
|
wkb->write_at_position(ls_pos, n_line_strings);
|
|
return 0;
|
|
}
|
|
|
|
|
|
uint Gis_multi_line_string::init_from_wkb(const char *wkb, uint len,
|
|
wkbByteOrder bo, String *res)
|
|
{
|
|
uint32 n_line_strings;
|
|
const char *wkb_orig= wkb;
|
|
|
|
if (len < 4)
|
|
return 0;
|
|
n_line_strings= wkb_get_uint(wkb, bo);
|
|
|
|
if (res->reserve(4, 512))
|
|
return 0;
|
|
res->q_append(n_line_strings);
|
|
|
|
wkb+= 4;
|
|
while (n_line_strings--)
|
|
{
|
|
Gis_line_string ls;
|
|
int ls_len;
|
|
|
|
if ((len < WKB_HEADER_SIZE) ||
|
|
res->reserve(WKB_HEADER_SIZE, 512))
|
|
return 0;
|
|
|
|
res->q_append((char) wkb_ndr);
|
|
res->q_append((uint32) wkb_linestring);
|
|
|
|
if (!(ls_len= ls.init_from_wkb(wkb + WKB_HEADER_SIZE, len,
|
|
(wkbByteOrder) wkb[0], res)))
|
|
return 0;
|
|
ls_len+= WKB_HEADER_SIZE;;
|
|
wkb+= ls_len;
|
|
len-= ls_len;
|
|
}
|
|
return (uint) (wkb - wkb_orig);
|
|
}
|
|
|
|
|
|
bool Gis_multi_line_string::get_data_as_wkt(String *txt,
|
|
const char **end) const
|
|
{
|
|
uint32 n_line_strings;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_line_strings= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_line_strings--)
|
|
{
|
|
uint32 n_points;
|
|
if (no_data(data, (WKB_HEADER_SIZE + 4)))
|
|
return 1;
|
|
n_points= uint4korr(data + WKB_HEADER_SIZE);
|
|
data+= WKB_HEADER_SIZE + 4;
|
|
if (no_data(data, n_points * (SIZEOF_STORED_DOUBLE*2)) ||
|
|
txt->reserve(2 + ((MAX_DIGITS_IN_DOUBLE + 1) * 2 + 1) * n_points))
|
|
return 1;
|
|
txt->qs_append('(');
|
|
data= append_points(txt, n_points, data, 0);
|
|
(*txt) [txt->length() - 1]= ')';
|
|
txt->qs_append(',');
|
|
}
|
|
txt->length(txt->length() - 1);
|
|
*end= data;
|
|
return 0;
|
|
}
|
|
|
|
|
|
bool Gis_multi_line_string::get_mbr(MBR *mbr, const char **end) const
|
|
{
|
|
uint32 n_line_strings;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_line_strings= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_line_strings--)
|
|
{
|
|
data+= WKB_HEADER_SIZE;
|
|
if (!(data= get_mbr_for_points(mbr, data, 0)))
|
|
return 1;
|
|
}
|
|
*end= data;
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_multi_line_string::num_geometries(uint32 *num) const
|
|
{
|
|
*num= uint4korr(m_data);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_multi_line_string::geometry_n(uint32 num, String *result) const
|
|
{
|
|
uint32 n_line_strings, n_points, length;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_line_strings= uint4korr(data);
|
|
data+= 4;
|
|
|
|
if ((num > n_line_strings) || (num < 1))
|
|
return 1;
|
|
|
|
for (;;)
|
|
{
|
|
if (no_data(data, WKB_HEADER_SIZE + 4))
|
|
return 1;
|
|
n_points= uint4korr(data + WKB_HEADER_SIZE);
|
|
length= WKB_HEADER_SIZE + 4+ POINT_DATA_SIZE * n_points;
|
|
if (no_data(data, length))
|
|
return 1;
|
|
if (!--num)
|
|
break;
|
|
data+= length;
|
|
}
|
|
return result->append(data, length, (uint32) 0);
|
|
}
|
|
|
|
|
|
int Gis_multi_line_string::length(double *len) const
|
|
{
|
|
uint32 n_line_strings;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_line_strings= uint4korr(data);
|
|
data+= 4;
|
|
|
|
*len=0;
|
|
while (n_line_strings--)
|
|
{
|
|
double ls_len;
|
|
Gis_line_string ls;
|
|
data+= WKB_HEADER_SIZE;
|
|
ls.set_data_ptr(data, (uint32) (m_data_end - data));
|
|
if (ls.length(&ls_len))
|
|
return 1;
|
|
*len+= ls_len;
|
|
/*
|
|
We know here that ls was ok, so we can call the trivial function
|
|
Gis_line_string::get_data_size without error checking
|
|
*/
|
|
data+= ls.get_data_size();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_multi_line_string::is_closed(int *closed) const
|
|
{
|
|
uint32 n_line_strings;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4 + WKB_HEADER_SIZE))
|
|
return 1;
|
|
n_line_strings= uint4korr(data);
|
|
data+= 4 + WKB_HEADER_SIZE;
|
|
|
|
while (n_line_strings--)
|
|
{
|
|
Gis_line_string ls;
|
|
if (no_data(data, 0))
|
|
return 1;
|
|
ls.set_data_ptr(data, (uint32) (m_data_end - data));
|
|
if (ls.is_closed(closed))
|
|
return 1;
|
|
if (!*closed)
|
|
return 0;
|
|
/*
|
|
We know here that ls was ok, so we can call the trivial function
|
|
Gis_line_string::get_data_size without error checking
|
|
*/
|
|
data+= ls.get_data_size() + WKB_HEADER_SIZE;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
const Geometry::Class_info *Gis_multi_line_string::get_class_info() const
|
|
{
|
|
return &multilinestring_class;
|
|
}
|
|
|
|
|
|
/***************************** MultiPolygon *******************************/
|
|
|
|
uint32 Gis_multi_polygon::get_data_size() const
|
|
{
|
|
uint32 n_polygons;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return GET_SIZE_ERROR;
|
|
n_polygons= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_polygons--)
|
|
{
|
|
uint32 n_linear_rings;
|
|
if (no_data(data, 4 + WKB_HEADER_SIZE))
|
|
return GET_SIZE_ERROR;
|
|
|
|
n_linear_rings= uint4korr(data + WKB_HEADER_SIZE);
|
|
data+= 4 + WKB_HEADER_SIZE;
|
|
|
|
while (n_linear_rings--)
|
|
{
|
|
if (no_data(data, 4))
|
|
return GET_SIZE_ERROR;
|
|
data+= 4 + uint4korr(data) * POINT_DATA_SIZE;
|
|
}
|
|
}
|
|
return (uint32) (data - m_data);
|
|
}
|
|
|
|
|
|
bool Gis_multi_polygon::init_from_wkt(Gis_read_stream *trs, String *wkb)
|
|
{
|
|
uint32 n_polygons= 0;
|
|
int np_pos= wkb->length();
|
|
Gis_polygon p;
|
|
|
|
if (wkb->reserve(4, 512))
|
|
return 1;
|
|
wkb->length(wkb->length()+4); // Reserve space for points
|
|
|
|
for (;;)
|
|
{
|
|
if (wkb->reserve(1+4, 512))
|
|
return 1;
|
|
wkb->q_append((char) wkb_ndr);
|
|
wkb->q_append((uint32) wkb_polygon);
|
|
|
|
if (trs->check_next_symbol('(') ||
|
|
p.init_from_wkt(trs, wkb) ||
|
|
trs->check_next_symbol(')'))
|
|
return 1;
|
|
n_polygons++;
|
|
if (trs->skip_char(',')) // Didn't find ','
|
|
break;
|
|
}
|
|
wkb->write_at_position(np_pos, n_polygons);
|
|
return 0;
|
|
}
|
|
|
|
|
|
uint Gis_multi_polygon::init_from_wkb(const char *wkb, uint len,
|
|
wkbByteOrder bo, String *res)
|
|
{
|
|
uint32 n_poly;
|
|
const char *wkb_orig= wkb;
|
|
|
|
if (len < 4)
|
|
return 0;
|
|
n_poly= wkb_get_uint(wkb, bo);
|
|
|
|
if (res->reserve(4, 512))
|
|
return 0;
|
|
res->q_append(n_poly);
|
|
|
|
wkb+=4;
|
|
while (n_poly--)
|
|
{
|
|
Gis_polygon p;
|
|
int p_len;
|
|
|
|
if (len < WKB_HEADER_SIZE ||
|
|
res->reserve(WKB_HEADER_SIZE, 512))
|
|
return 0;
|
|
res->q_append((char) wkb_ndr);
|
|
res->q_append((uint32) wkb_polygon);
|
|
|
|
if (!(p_len= p.init_from_wkb(wkb + WKB_HEADER_SIZE, len,
|
|
(wkbByteOrder) wkb[0], res)))
|
|
return 0;
|
|
p_len+= WKB_HEADER_SIZE;
|
|
wkb+= p_len;
|
|
len-= p_len;
|
|
}
|
|
return (uint) (wkb - wkb_orig);
|
|
}
|
|
|
|
|
|
bool Gis_multi_polygon::get_data_as_wkt(String *txt, const char **end) const
|
|
{
|
|
uint32 n_polygons;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_polygons= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_polygons--)
|
|
{
|
|
uint32 n_linear_rings;
|
|
if (no_data(data, 4 + WKB_HEADER_SIZE) ||
|
|
txt->reserve(1, 512))
|
|
return 1;
|
|
n_linear_rings= uint4korr(data+WKB_HEADER_SIZE);
|
|
data+= 4 + WKB_HEADER_SIZE;
|
|
txt->q_append('(');
|
|
|
|
while (n_linear_rings--)
|
|
{
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
uint32 n_points= uint4korr(data);
|
|
data+= 4;
|
|
if (no_data(data, (SIZEOF_STORED_DOUBLE * 2) * n_points) ||
|
|
txt->reserve(2 + ((MAX_DIGITS_IN_DOUBLE + 1) * 2 + 1) * n_points,
|
|
512))
|
|
return 1;
|
|
txt->qs_append('(');
|
|
data= append_points(txt, n_points, data, 0);
|
|
(*txt) [txt->length() - 1]= ')';
|
|
txt->qs_append(',');
|
|
}
|
|
(*txt) [txt->length() - 1]= ')';
|
|
txt->qs_append(',');
|
|
}
|
|
txt->length(txt->length() - 1);
|
|
*end= data;
|
|
return 0;
|
|
}
|
|
|
|
|
|
bool Gis_multi_polygon::get_mbr(MBR *mbr, const char **end) const
|
|
{
|
|
uint32 n_polygons;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_polygons= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_polygons--)
|
|
{
|
|
uint32 n_linear_rings;
|
|
if (no_data(data, 4+WKB_HEADER_SIZE))
|
|
return 1;
|
|
n_linear_rings= uint4korr(data + WKB_HEADER_SIZE);
|
|
data+= WKB_HEADER_SIZE + 4;
|
|
|
|
while (n_linear_rings--)
|
|
{
|
|
if (!(data= get_mbr_for_points(mbr, data, 0)))
|
|
return 1;
|
|
}
|
|
}
|
|
*end= data;
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_multi_polygon::num_geometries(uint32 *num) const
|
|
{
|
|
*num= uint4korr(m_data);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_multi_polygon::geometry_n(uint32 num, String *result) const
|
|
{
|
|
uint32 n_polygons;
|
|
const char *data= m_data, *start_of_polygon;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_polygons= uint4korr(data);
|
|
data+= 4;
|
|
|
|
if (num > n_polygons || num < 1)
|
|
return -1;
|
|
|
|
do
|
|
{
|
|
uint32 n_linear_rings;
|
|
start_of_polygon= data;
|
|
|
|
if (no_data(data, WKB_HEADER_SIZE + 4))
|
|
return 1;
|
|
n_linear_rings= uint4korr(data + WKB_HEADER_SIZE);
|
|
data+= WKB_HEADER_SIZE + 4;
|
|
|
|
while (n_linear_rings--)
|
|
{
|
|
uint32 n_points;
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_points= uint4korr(data);
|
|
data+= 4 + POINT_DATA_SIZE * n_points;
|
|
}
|
|
} while (--num);
|
|
if (no_data(data, 0)) // We must check last segment
|
|
return 1;
|
|
return result->append(start_of_polygon, (uint32) (data - start_of_polygon),
|
|
(uint32) 0);
|
|
}
|
|
|
|
|
|
int Gis_multi_polygon::area(double *ar, const char **end_of_data) const
|
|
{
|
|
uint32 n_polygons;
|
|
const char *data= m_data;
|
|
double result= 0;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_polygons= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_polygons--)
|
|
{
|
|
double p_area;
|
|
Gis_polygon p;
|
|
|
|
data+= WKB_HEADER_SIZE;
|
|
p.set_data_ptr(data, (uint32) (m_data_end - data));
|
|
if (p.area(&p_area, &data))
|
|
return 1;
|
|
result+= p_area;
|
|
}
|
|
*ar= result;
|
|
*end_of_data= data;
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_multi_polygon::centroid(String *result) const
|
|
{
|
|
uint32 n_polygons;
|
|
bool first_loop= 1;
|
|
Gis_polygon p;
|
|
double res_area, res_cx, res_cy;
|
|
double cur_area, cur_cx, cur_cy;
|
|
const char *data= m_data;
|
|
|
|
LINT_INIT(res_area);
|
|
LINT_INIT(res_cx);
|
|
LINT_INIT(res_cy);
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_polygons= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_polygons--)
|
|
{
|
|
data+= WKB_HEADER_SIZE;
|
|
p.set_data_ptr(data, (uint32) (m_data_end - data));
|
|
if (p.area(&cur_area, &data) ||
|
|
p.centroid_xy(&cur_cx, &cur_cy))
|
|
return 1;
|
|
|
|
if (!first_loop)
|
|
{
|
|
double sum_area= res_area + cur_area;
|
|
res_cx= (res_area * res_cx + cur_area * cur_cx) / sum_area;
|
|
res_cy= (res_area * res_cy + cur_area * cur_cy) / sum_area;
|
|
}
|
|
else
|
|
{
|
|
first_loop= 0;
|
|
res_area= cur_area;
|
|
res_cx= cur_cx;
|
|
res_cy= cur_cy;
|
|
}
|
|
}
|
|
|
|
return create_point(result, res_cx, res_cy);
|
|
}
|
|
|
|
const Geometry::Class_info *Gis_multi_polygon::get_class_info() const
|
|
{
|
|
return &multipolygon_class;
|
|
}
|
|
|
|
|
|
/************************* GeometryCollection ****************************/
|
|
|
|
uint32 Gis_geometry_collection::get_data_size() const
|
|
{
|
|
uint32 n_objects;
|
|
const char *data= m_data;
|
|
Geometry_buffer buffer;
|
|
Geometry *geom;
|
|
|
|
if (no_data(data, 4))
|
|
return GET_SIZE_ERROR;
|
|
n_objects= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_objects--)
|
|
{
|
|
uint32 wkb_type,object_size;
|
|
|
|
if (no_data(data, WKB_HEADER_SIZE))
|
|
return GET_SIZE_ERROR;
|
|
wkb_type= uint4korr(data + 1);
|
|
data+= WKB_HEADER_SIZE;
|
|
|
|
if (!(geom= create_by_typeid(&buffer, wkb_type)))
|
|
return GET_SIZE_ERROR;
|
|
geom->set_data_ptr(data, (uint) (m_data_end - data));
|
|
if ((object_size= geom->get_data_size()) == GET_SIZE_ERROR)
|
|
return GET_SIZE_ERROR;
|
|
data+= object_size;
|
|
}
|
|
return (uint32) (data - m_data);
|
|
}
|
|
|
|
|
|
bool Gis_geometry_collection::init_from_wkt(Gis_read_stream *trs, String *wkb)
|
|
{
|
|
uint32 n_objects= 0;
|
|
uint32 no_pos= wkb->length();
|
|
Geometry_buffer buffer;
|
|
Geometry *g;
|
|
|
|
if (wkb->reserve(4, 512))
|
|
return 1;
|
|
wkb->length(wkb->length()+4); // Reserve space for points
|
|
|
|
for (;;)
|
|
{
|
|
if (!(g= create_from_wkt(&buffer, trs, wkb)))
|
|
return 1;
|
|
|
|
if (g->get_class_info()->m_type_id == wkb_geometrycollection)
|
|
{
|
|
trs->set_error_msg("Unexpected GEOMETRYCOLLECTION");
|
|
return 1;
|
|
}
|
|
n_objects++;
|
|
if (trs->skip_char(',')) // Didn't find ','
|
|
break;
|
|
}
|
|
|
|
wkb->write_at_position(no_pos, n_objects);
|
|
return 0;
|
|
}
|
|
|
|
|
|
uint Gis_geometry_collection::init_from_wkb(const char *wkb, uint len,
|
|
wkbByteOrder bo, String *res)
|
|
{
|
|
uint32 n_geom;
|
|
const char *wkb_orig= wkb;
|
|
|
|
if (len < 4)
|
|
return 0;
|
|
n_geom= wkb_get_uint(wkb, bo);
|
|
|
|
if (res->reserve(4, 512))
|
|
return 0;
|
|
res->q_append(n_geom);
|
|
|
|
wkb+= 4;
|
|
while (n_geom--)
|
|
{
|
|
Geometry_buffer buffer;
|
|
Geometry *geom;
|
|
int g_len;
|
|
uint32 wkb_type;
|
|
|
|
if (len < WKB_HEADER_SIZE ||
|
|
res->reserve(WKB_HEADER_SIZE, 512))
|
|
return 0;
|
|
|
|
res->q_append((char) wkb_ndr);
|
|
wkb_type= wkb_get_uint(wkb+1, (wkbByteOrder) wkb[0]);
|
|
res->q_append(wkb_type);
|
|
|
|
if (!(geom= create_by_typeid(&buffer, wkb_type)) ||
|
|
!(g_len= geom->init_from_wkb(wkb + WKB_HEADER_SIZE, len,
|
|
(wkbByteOrder) wkb[0], res)))
|
|
return 0;
|
|
g_len+= WKB_HEADER_SIZE;
|
|
wkb+= g_len;
|
|
len-= g_len;
|
|
}
|
|
return (uint) (wkb - wkb_orig);
|
|
}
|
|
|
|
|
|
bool Gis_geometry_collection::get_data_as_wkt(String *txt,
|
|
const char **end) const
|
|
{
|
|
uint32 n_objects;
|
|
Geometry_buffer buffer;
|
|
Geometry *geom;
|
|
const char *data= m_data;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_objects= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_objects--)
|
|
{
|
|
uint32 wkb_type;
|
|
|
|
if (no_data(data, WKB_HEADER_SIZE))
|
|
return 1;
|
|
wkb_type= uint4korr(data + 1);
|
|
data+= WKB_HEADER_SIZE;
|
|
|
|
if (!(geom= create_by_typeid(&buffer, wkb_type)))
|
|
return 1;
|
|
geom->set_data_ptr(data, (uint) (m_data_end - data));
|
|
if (geom->as_wkt(txt, &data))
|
|
return 1;
|
|
if (txt->append(STRING_WITH_LEN(","), 512))
|
|
return 1;
|
|
}
|
|
txt->length(txt->length() - 1);
|
|
*end= data;
|
|
return 0;
|
|
}
|
|
|
|
|
|
bool Gis_geometry_collection::get_mbr(MBR *mbr, const char **end) const
|
|
{
|
|
uint32 n_objects;
|
|
const char *data= m_data;
|
|
Geometry_buffer buffer;
|
|
Geometry *geom;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_objects= uint4korr(data);
|
|
data+= 4;
|
|
|
|
while (n_objects--)
|
|
{
|
|
uint32 wkb_type;
|
|
|
|
if (no_data(data, WKB_HEADER_SIZE))
|
|
return 1;
|
|
wkb_type= uint4korr(data + 1);
|
|
data+= WKB_HEADER_SIZE;
|
|
|
|
if (!(geom= create_by_typeid(&buffer, wkb_type)))
|
|
return 1;
|
|
geom->set_data_ptr(data, (uint32) (m_data_end - data));
|
|
if (geom->get_mbr(mbr, &data))
|
|
return 1;
|
|
}
|
|
*end= data;
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_geometry_collection::num_geometries(uint32 *num) const
|
|
{
|
|
if (no_data(m_data, 4))
|
|
return 1;
|
|
*num= uint4korr(m_data);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Gis_geometry_collection::geometry_n(uint32 num, String *result) const
|
|
{
|
|
uint32 n_objects, wkb_type, length;
|
|
const char *data= m_data;
|
|
Geometry_buffer buffer;
|
|
Geometry *geom;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_objects= uint4korr(data);
|
|
data+= 4;
|
|
if (num > n_objects || num < 1)
|
|
return 1;
|
|
|
|
do
|
|
{
|
|
if (no_data(data, WKB_HEADER_SIZE))
|
|
return 1;
|
|
wkb_type= uint4korr(data + 1);
|
|
data+= WKB_HEADER_SIZE;
|
|
|
|
if (!(geom= create_by_typeid(&buffer, wkb_type)))
|
|
return 1;
|
|
geom->set_data_ptr(data, (uint) (m_data_end - data));
|
|
if ((length= geom->get_data_size()) == GET_SIZE_ERROR)
|
|
return 1;
|
|
data+= length;
|
|
} while (--num);
|
|
|
|
/* Copy found object to result */
|
|
if (result->reserve(1+4+length))
|
|
return 1;
|
|
result->q_append((char) wkb_ndr);
|
|
result->q_append((uint32) wkb_type);
|
|
result->q_append(data-length, length); // data-length = start_of_data
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Return dimension for object
|
|
|
|
SYNOPSIS
|
|
dimension()
|
|
res_dim Result dimension
|
|
end End of object will be stored here. May be 0 for
|
|
simple objects!
|
|
RETURN
|
|
0 ok
|
|
1 error
|
|
*/
|
|
|
|
bool Gis_geometry_collection::dimension(uint32 *res_dim, const char **end) const
|
|
{
|
|
uint32 n_objects;
|
|
const char *data= m_data;
|
|
Geometry_buffer buffer;
|
|
Geometry *geom;
|
|
|
|
if (no_data(data, 4))
|
|
return 1;
|
|
n_objects= uint4korr(data);
|
|
data+= 4;
|
|
|
|
*res_dim= 0;
|
|
while (n_objects--)
|
|
{
|
|
uint32 wkb_type, length, dim;
|
|
const char *end_data;
|
|
|
|
if (no_data(data, WKB_HEADER_SIZE))
|
|
return 1;
|
|
wkb_type= uint4korr(data + 1);
|
|
data+= WKB_HEADER_SIZE;
|
|
if (!(geom= create_by_typeid(&buffer, wkb_type)))
|
|
return 1;
|
|
geom->set_data_ptr(data, (uint32) (m_data_end - data));
|
|
if (geom->dimension(&dim, &end_data))
|
|
return 1;
|
|
set_if_bigger(*res_dim, dim);
|
|
if (end_data) // Complex object
|
|
data= end_data;
|
|
else if ((length= geom->get_data_size()) == GET_SIZE_ERROR)
|
|
return 1;
|
|
else
|
|
data+= length;
|
|
}
|
|
*end= data;
|
|
return 0;
|
|
}
|
|
|
|
const Geometry::Class_info *Gis_geometry_collection::get_class_info() const
|
|
{
|
|
return &geometrycollection_class;
|
|
}
|
|
|
|
#endif /*HAVE_SPATIAL*/
|