mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +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
3130 lines
91 KiB
C
3130 lines
91 KiB
C
/* Copyright (C) 2000-2003 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
This file is included by both libmysql.c (the MySQL client C API)
|
|
and the mysqld server to connect to another MYSQL server.
|
|
|
|
The differences for the two cases are:
|
|
|
|
- Things that only works for the client:
|
|
- Trying to automaticly determinate user name if not supplied to
|
|
mysql_real_connect()
|
|
- Support for reading local file with LOAD DATA LOCAL
|
|
- SHARED memory handling
|
|
- Protection against sigpipe
|
|
- Prepared statements
|
|
|
|
- Things that only works for the server
|
|
- Alarm handling on connect
|
|
|
|
In all other cases, the code should be idential for the client and
|
|
server.
|
|
*/
|
|
|
|
#include <my_global.h>
|
|
|
|
#include "mysql.h"
|
|
|
|
/* Remove client convenience wrappers */
|
|
#undef max_allowed_packet
|
|
#undef net_buffer_length
|
|
|
|
#ifdef EMBEDDED_LIBRARY
|
|
|
|
#undef MYSQL_SERVER
|
|
|
|
#ifndef MYSQL_CLIENT
|
|
#define MYSQL_CLIENT
|
|
#endif
|
|
|
|
#define CLI_MYSQL_REAL_CONNECT cli_mysql_real_connect
|
|
|
|
#undef net_flush
|
|
my_bool net_flush(NET *net);
|
|
|
|
#else /*EMBEDDED_LIBRARY*/
|
|
#define CLI_MYSQL_REAL_CONNECT STDCALL mysql_real_connect
|
|
#endif /*EMBEDDED_LIBRARY*/
|
|
#include <my_sys.h>
|
|
#include <mysys_err.h>
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
#include "mysql_version.h"
|
|
#include "mysqld_error.h"
|
|
#include "errmsg.h"
|
|
#include <violite.h>
|
|
#if defined(THREAD) && !defined(__WIN__)
|
|
#include <my_pthread.h> /* because of signal() */
|
|
#endif /* defined(THREAD) && !defined(__WIN__) */
|
|
|
|
#include <sys/stat.h>
|
|
#include <signal.h>
|
|
#include <time.h>
|
|
#ifdef HAVE_PWD_H
|
|
#include <pwd.h>
|
|
#endif
|
|
#if !defined(MSDOS) && !defined(__WIN__)
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <netdb.h>
|
|
#ifdef HAVE_SELECT_H
|
|
# include <select.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_SELECT_H
|
|
#include <sys/select.h>
|
|
#endif
|
|
#endif /*!defined(MSDOS) && !defined(__WIN__) */
|
|
#ifdef HAVE_SYS_UN_H
|
|
# include <sys/un.h>
|
|
#endif
|
|
|
|
#if defined(MSDOS) || defined(__WIN__)
|
|
#define perror(A)
|
|
#else
|
|
#include <errno.h>
|
|
#define SOCKET_ERROR -1
|
|
#endif
|
|
|
|
#ifdef __WIN__
|
|
#define CONNECT_TIMEOUT 20
|
|
#else
|
|
#define CONNECT_TIMEOUT 0
|
|
#endif
|
|
|
|
#include "client_settings.h"
|
|
#include <sql_common.h>
|
|
|
|
uint mysql_port=0;
|
|
char *mysql_unix_port= 0;
|
|
const char *unknown_sqlstate= "HY000";
|
|
const char *not_error_sqlstate= "00000";
|
|
#ifdef HAVE_SMEM
|
|
char *shared_memory_base_name= 0;
|
|
const char *def_shared_memory_base_name= default_shared_memory_base_name;
|
|
#endif
|
|
|
|
static void mysql_close_free_options(MYSQL *mysql);
|
|
static void mysql_close_free(MYSQL *mysql);
|
|
|
|
#if !(defined(__WIN__) || defined(__NETWARE__))
|
|
static int wait_for_data(my_socket fd, uint timeout);
|
|
#endif
|
|
|
|
CHARSET_INFO *default_client_charset_info = &my_charset_latin1;
|
|
|
|
|
|
/****************************************************************************
|
|
A modified version of connect(). my_connect() allows you to specify
|
|
a timeout value, in seconds, that we should wait until we
|
|
derermine we can't connect to a particular host. If timeout is 0,
|
|
my_connect() will behave exactly like connect().
|
|
|
|
Base version coded by Steve Bernacki, Jr. <steve@navinet.net>
|
|
*****************************************************************************/
|
|
|
|
int my_connect(my_socket fd, const struct sockaddr *name, uint namelen,
|
|
uint timeout)
|
|
{
|
|
#if defined(__WIN__) || defined(__NETWARE__)
|
|
return connect(fd, (struct sockaddr*) name, namelen);
|
|
#else
|
|
int flags, res, s_err;
|
|
|
|
/*
|
|
If they passed us a timeout of zero, we should behave
|
|
exactly like the normal connect() call does.
|
|
*/
|
|
|
|
if (timeout == 0)
|
|
return connect(fd, (struct sockaddr*) name, namelen);
|
|
|
|
flags = fcntl(fd, F_GETFL, 0); /* Set socket to not block */
|
|
#ifdef O_NONBLOCK
|
|
fcntl(fd, F_SETFL, flags | O_NONBLOCK); /* and save the flags.. */
|
|
#endif
|
|
|
|
res= connect(fd, (struct sockaddr*) name, namelen);
|
|
s_err= errno; /* Save the error... */
|
|
fcntl(fd, F_SETFL, flags);
|
|
if ((res != 0) && (s_err != EINPROGRESS))
|
|
{
|
|
errno= s_err; /* Restore it */
|
|
return(-1);
|
|
}
|
|
if (res == 0) /* Connected quickly! */
|
|
return(0);
|
|
return wait_for_data(fd, timeout);
|
|
#endif
|
|
}
|
|
|
|
|
|
/*
|
|
Wait up to timeout seconds for a connection to be established.
|
|
|
|
We prefer to do this with poll() as there is no limitations with this.
|
|
If not, we will use select()
|
|
*/
|
|
|
|
#if !(defined(__WIN__) || defined(__NETWARE__))
|
|
|
|
static int wait_for_data(my_socket fd, uint timeout)
|
|
{
|
|
#ifdef HAVE_POLL
|
|
struct pollfd ufds;
|
|
int res;
|
|
|
|
ufds.fd= fd;
|
|
ufds.events= POLLIN | POLLPRI;
|
|
if (!(res= poll(&ufds, 1, (int) timeout*1000)))
|
|
{
|
|
errno= EINTR;
|
|
return -1;
|
|
}
|
|
if (res < 0 || !(ufds.revents & (POLLIN | POLLPRI)))
|
|
return -1;
|
|
return 0;
|
|
#else
|
|
SOCKOPT_OPTLEN_TYPE s_err_size = sizeof(uint);
|
|
fd_set sfds;
|
|
struct timeval tv;
|
|
time_t start_time, now_time;
|
|
int res, s_err;
|
|
|
|
if (fd >= FD_SETSIZE) /* Check if wrong error */
|
|
return 0; /* Can't use timeout */
|
|
|
|
/*
|
|
Our connection is "in progress." We can use the select() call to wait
|
|
up to a specified period of time for the connection to suceed.
|
|
If select() returns 0 (after waiting howevermany seconds), our socket
|
|
never became writable (host is probably unreachable.) Otherwise, if
|
|
select() returns 1, then one of two conditions exist:
|
|
|
|
1. An error occured. We use getsockopt() to check for this.
|
|
2. The connection was set up sucessfully: getsockopt() will
|
|
return 0 as an error.
|
|
|
|
Thanks goes to Andrew Gierth <andrew@erlenstar.demon.co.uk>
|
|
who posted this method of timing out a connect() in
|
|
comp.unix.programmer on August 15th, 1997.
|
|
*/
|
|
|
|
FD_ZERO(&sfds);
|
|
FD_SET(fd, &sfds);
|
|
/*
|
|
select could be interrupted by a signal, and if it is,
|
|
the timeout should be adjusted and the select restarted
|
|
to work around OSes that don't restart select and
|
|
implementations of select that don't adjust tv upon
|
|
failure to reflect the time remaining
|
|
*/
|
|
start_time = time(NULL);
|
|
for (;;)
|
|
{
|
|
tv.tv_sec = (long) timeout;
|
|
tv.tv_usec = 0;
|
|
#if defined(HPUX10) && defined(THREAD)
|
|
if ((res = select(fd+1, NULL, (int*) &sfds, NULL, &tv)) > 0)
|
|
break;
|
|
#else
|
|
if ((res = select(fd+1, NULL, &sfds, NULL, &tv)) > 0)
|
|
break;
|
|
#endif
|
|
if (res == 0) /* timeout */
|
|
return -1;
|
|
now_time=time(NULL);
|
|
timeout-= (uint) (now_time - start_time);
|
|
if (errno != EINTR || (int) timeout <= 0)
|
|
return -1;
|
|
}
|
|
|
|
/*
|
|
select() returned something more interesting than zero, let's
|
|
see if we have any errors. If the next two statements pass,
|
|
we've got an open socket!
|
|
*/
|
|
|
|
s_err=0;
|
|
if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (char*) &s_err, &s_err_size) != 0)
|
|
return(-1);
|
|
|
|
if (s_err)
|
|
{ /* getsockopt could succeed */
|
|
errno = s_err;
|
|
return(-1); /* but return an error... */
|
|
}
|
|
return (0); /* ok */
|
|
#endif /* HAVE_POLL */
|
|
}
|
|
#endif /* defined(__WIN__) || defined(__NETWARE__) */
|
|
|
|
|
|
/*
|
|
Create a named pipe connection
|
|
*/
|
|
|
|
#ifdef __WIN__
|
|
|
|
HANDLE create_named_pipe(NET *net, uint connect_timeout, char **arg_host,
|
|
char **arg_unix_socket)
|
|
{
|
|
HANDLE hPipe=INVALID_HANDLE_VALUE;
|
|
char pipe_name[1024];
|
|
DWORD dwMode;
|
|
int i;
|
|
my_bool testing_named_pipes=0;
|
|
char *host= *arg_host, *unix_socket= *arg_unix_socket;
|
|
|
|
if ( ! unix_socket || (unix_socket)[0] == 0x00)
|
|
unix_socket = mysql_unix_port;
|
|
if (!host || !strcmp(host,LOCAL_HOST))
|
|
host=LOCAL_HOST_NAMEDPIPE;
|
|
|
|
|
|
pipe_name[sizeof(pipe_name)-1]= 0; /* Safety if too long string */
|
|
strxnmov(pipe_name, sizeof(pipe_name)-1, "\\\\", host, "\\pipe\\",
|
|
unix_socket, NullS);
|
|
DBUG_PRINT("info",("Server name: '%s'. Named Pipe: %s", host, unix_socket));
|
|
|
|
for (i=0 ; i < 100 ; i++) /* Don't retry forever */
|
|
{
|
|
if ((hPipe = CreateFile(pipe_name,
|
|
GENERIC_READ | GENERIC_WRITE,
|
|
0,
|
|
NULL,
|
|
OPEN_EXISTING,
|
|
0,
|
|
NULL )) != INVALID_HANDLE_VALUE)
|
|
break;
|
|
if (GetLastError() != ERROR_PIPE_BUSY)
|
|
{
|
|
net->last_errno=CR_NAMEDPIPEOPEN_ERROR;
|
|
strmov(net->sqlstate, unknown_sqlstate);
|
|
my_snprintf(net->last_error, sizeof(net->last_error)-1,
|
|
ER(net->last_errno), host, unix_socket,
|
|
(ulong) GetLastError());
|
|
return INVALID_HANDLE_VALUE;
|
|
}
|
|
/* wait for for an other instance */
|
|
if (! WaitNamedPipe(pipe_name, connect_timeout*1000) )
|
|
{
|
|
net->last_errno=CR_NAMEDPIPEWAIT_ERROR;
|
|
strmov(net->sqlstate, unknown_sqlstate);
|
|
my_snprintf(net->last_error, sizeof(net->last_error)-1,
|
|
ER(net->last_errno), host, unix_socket,
|
|
(ulong) GetLastError());
|
|
return INVALID_HANDLE_VALUE;
|
|
}
|
|
}
|
|
if (hPipe == INVALID_HANDLE_VALUE)
|
|
{
|
|
net->last_errno=CR_NAMEDPIPEOPEN_ERROR;
|
|
strmov(net->sqlstate, unknown_sqlstate);
|
|
my_snprintf(net->last_error, sizeof(net->last_error)-1,
|
|
ER(net->last_errno), host, unix_socket,
|
|
(ulong) GetLastError());
|
|
return INVALID_HANDLE_VALUE;
|
|
}
|
|
dwMode = PIPE_READMODE_BYTE | PIPE_WAIT;
|
|
if ( !SetNamedPipeHandleState(hPipe, &dwMode, NULL, NULL) )
|
|
{
|
|
CloseHandle( hPipe );
|
|
net->last_errno=CR_NAMEDPIPESETSTATE_ERROR;
|
|
strmov(net->sqlstate, unknown_sqlstate);
|
|
my_snprintf(net->last_error, sizeof(net->last_error)-1,
|
|
ER(net->last_errno),host, unix_socket,
|
|
(ulong) GetLastError());
|
|
return INVALID_HANDLE_VALUE;
|
|
}
|
|
*arg_host=host ; *arg_unix_socket=unix_socket; /* connect arg */
|
|
return (hPipe);
|
|
}
|
|
#endif
|
|
|
|
|
|
/*
|
|
Create new shared memory connection, return handler of connection
|
|
|
|
SYNOPSIS
|
|
create_shared_memory()
|
|
mysql Pointer of mysql structure
|
|
net Pointer of net structure
|
|
connect_timeout Timeout of connection
|
|
*/
|
|
|
|
#ifdef HAVE_SMEM
|
|
HANDLE create_shared_memory(MYSQL *mysql,NET *net, uint connect_timeout)
|
|
{
|
|
ulong smem_buffer_length = shared_memory_buffer_length + 4;
|
|
/*
|
|
event_connect_request is event object for start connection actions
|
|
event_connect_answer is event object for confirm, that server put data
|
|
handle_connect_file_map is file-mapping object, use for create shared
|
|
memory
|
|
handle_connect_map is pointer on shared memory
|
|
handle_map is pointer on shared memory for client
|
|
event_server_wrote,
|
|
event_server_read,
|
|
event_client_wrote,
|
|
event_client_read are events for transfer data between server and client
|
|
handle_file_map is file-mapping object, use for create shared memory
|
|
*/
|
|
HANDLE event_connect_request = NULL;
|
|
HANDLE event_connect_answer = NULL;
|
|
HANDLE handle_connect_file_map = NULL;
|
|
char *handle_connect_map = NULL;
|
|
|
|
char *handle_map = NULL;
|
|
HANDLE event_server_wrote = NULL;
|
|
HANDLE event_server_read = NULL;
|
|
HANDLE event_client_wrote = NULL;
|
|
HANDLE event_client_read = NULL;
|
|
HANDLE event_conn_closed = NULL;
|
|
HANDLE handle_file_map = NULL;
|
|
ulong connect_number;
|
|
char connect_number_char[22], *p;
|
|
char tmp[64];
|
|
char *suffix_pos;
|
|
DWORD error_allow = 0;
|
|
DWORD error_code = 0;
|
|
DWORD event_access_rights= SYNCHRONIZE | EVENT_MODIFY_STATE;
|
|
char *shared_memory_base_name = mysql->options.shared_memory_base_name;
|
|
|
|
/*
|
|
The name of event and file-mapping events create agree next rule:
|
|
shared_memory_base_name+unique_part
|
|
Where:
|
|
shared_memory_base_name is unique value for each server
|
|
unique_part is uniquel value for each object (events and file-mapping)
|
|
*/
|
|
suffix_pos = strxmov(tmp,shared_memory_base_name,"_",NullS);
|
|
strmov(suffix_pos, "CONNECT_REQUEST");
|
|
if (!(event_connect_request= OpenEvent(event_access_rights, FALSE, tmp)))
|
|
{
|
|
error_allow = CR_SHARED_MEMORY_CONNECT_REQUEST_ERROR;
|
|
goto err;
|
|
}
|
|
strmov(suffix_pos, "CONNECT_ANSWER");
|
|
if (!(event_connect_answer= OpenEvent(event_access_rights,FALSE,tmp)))
|
|
{
|
|
error_allow = CR_SHARED_MEMORY_CONNECT_ANSWER_ERROR;
|
|
goto err;
|
|
}
|
|
strmov(suffix_pos, "CONNECT_DATA");
|
|
if (!(handle_connect_file_map= OpenFileMapping(FILE_MAP_WRITE,FALSE,tmp)))
|
|
{
|
|
error_allow = CR_SHARED_MEMORY_CONNECT_FILE_MAP_ERROR;
|
|
goto err;
|
|
}
|
|
if (!(handle_connect_map= MapViewOfFile(handle_connect_file_map,
|
|
FILE_MAP_WRITE,0,0,sizeof(DWORD))))
|
|
{
|
|
error_allow = CR_SHARED_MEMORY_CONNECT_MAP_ERROR;
|
|
goto err;
|
|
}
|
|
|
|
/* Send to server request of connection */
|
|
if (!SetEvent(event_connect_request))
|
|
{
|
|
error_allow = CR_SHARED_MEMORY_CONNECT_SET_ERROR;
|
|
goto err;
|
|
}
|
|
|
|
/* Wait of answer from server */
|
|
if (WaitForSingleObject(event_connect_answer,connect_timeout*1000) !=
|
|
WAIT_OBJECT_0)
|
|
{
|
|
error_allow = CR_SHARED_MEMORY_CONNECT_ABANDONED_ERROR;
|
|
goto err;
|
|
}
|
|
|
|
/* Get number of connection */
|
|
connect_number = uint4korr(handle_connect_map);/*WAX2*/
|
|
p= int10_to_str(connect_number, connect_number_char, 10);
|
|
|
|
/*
|
|
The name of event and file-mapping events create agree next rule:
|
|
shared_memory_base_name+unique_part+number_of_connection
|
|
|
|
Where:
|
|
shared_memory_base_name is uniquel value for each server
|
|
unique_part is uniquel value for each object (events and file-mapping)
|
|
number_of_connection is number of connection between server and client
|
|
*/
|
|
suffix_pos = strxmov(tmp,shared_memory_base_name,"_",connect_number_char,
|
|
"_",NullS);
|
|
strmov(suffix_pos, "DATA");
|
|
if ((handle_file_map = OpenFileMapping(FILE_MAP_WRITE,FALSE,tmp)) == NULL)
|
|
{
|
|
error_allow = CR_SHARED_MEMORY_FILE_MAP_ERROR;
|
|
goto err2;
|
|
}
|
|
if ((handle_map = MapViewOfFile(handle_file_map,FILE_MAP_WRITE,0,0,
|
|
smem_buffer_length)) == NULL)
|
|
{
|
|
error_allow = CR_SHARED_MEMORY_MAP_ERROR;
|
|
goto err2;
|
|
}
|
|
|
|
strmov(suffix_pos, "SERVER_WROTE");
|
|
if ((event_server_wrote = OpenEvent(event_access_rights,FALSE,tmp)) == NULL)
|
|
{
|
|
error_allow = CR_SHARED_MEMORY_EVENT_ERROR;
|
|
goto err2;
|
|
}
|
|
|
|
strmov(suffix_pos, "SERVER_READ");
|
|
if ((event_server_read = OpenEvent(event_access_rights,FALSE,tmp)) == NULL)
|
|
{
|
|
error_allow = CR_SHARED_MEMORY_EVENT_ERROR;
|
|
goto err2;
|
|
}
|
|
|
|
strmov(suffix_pos, "CLIENT_WROTE");
|
|
if ((event_client_wrote = OpenEvent(event_access_rights,FALSE,tmp)) == NULL)
|
|
{
|
|
error_allow = CR_SHARED_MEMORY_EVENT_ERROR;
|
|
goto err2;
|
|
}
|
|
|
|
strmov(suffix_pos, "CLIENT_READ");
|
|
if ((event_client_read = OpenEvent(event_access_rights,FALSE,tmp)) == NULL)
|
|
{
|
|
error_allow = CR_SHARED_MEMORY_EVENT_ERROR;
|
|
goto err2;
|
|
}
|
|
|
|
strmov(suffix_pos, "CONNECTION_CLOSED");
|
|
if ((event_conn_closed = OpenEvent(event_access_rights,FALSE,tmp)) == NULL)
|
|
{
|
|
error_allow = CR_SHARED_MEMORY_EVENT_ERROR;
|
|
goto err2;
|
|
}
|
|
/*
|
|
Set event that server should send data
|
|
*/
|
|
SetEvent(event_server_read);
|
|
|
|
err2:
|
|
if (error_allow == 0)
|
|
{
|
|
net->vio= vio_new_win32shared_memory(net,handle_file_map,handle_map,
|
|
event_server_wrote,
|
|
event_server_read,event_client_wrote,
|
|
event_client_read,event_conn_closed);
|
|
}
|
|
else
|
|
{
|
|
error_code = GetLastError();
|
|
if (event_server_read)
|
|
CloseHandle(event_server_read);
|
|
if (event_server_wrote)
|
|
CloseHandle(event_server_wrote);
|
|
if (event_client_read)
|
|
CloseHandle(event_client_read);
|
|
if (event_client_wrote)
|
|
CloseHandle(event_client_wrote);
|
|
if (event_conn_closed)
|
|
CloseHandle(event_conn_closed);
|
|
if (handle_map)
|
|
UnmapViewOfFile(handle_map);
|
|
if (handle_file_map)
|
|
CloseHandle(handle_file_map);
|
|
}
|
|
err:
|
|
if (error_allow)
|
|
error_code = GetLastError();
|
|
if (event_connect_request)
|
|
CloseHandle(event_connect_request);
|
|
if (event_connect_answer)
|
|
CloseHandle(event_connect_answer);
|
|
if (handle_connect_map)
|
|
UnmapViewOfFile(handle_connect_map);
|
|
if (handle_connect_file_map)
|
|
CloseHandle(handle_connect_file_map);
|
|
if (error_allow)
|
|
{
|
|
net->last_errno=error_allow;
|
|
strmov(net->sqlstate, unknown_sqlstate);
|
|
if (error_allow == CR_SHARED_MEMORY_EVENT_ERROR)
|
|
my_snprintf(net->last_error,sizeof(net->last_error)-1,
|
|
ER(net->last_errno),suffix_pos,error_code);
|
|
else
|
|
my_snprintf(net->last_error,sizeof(net->last_error)-1,
|
|
ER(net->last_errno),error_code);
|
|
return(INVALID_HANDLE_VALUE);
|
|
}
|
|
return(handle_map);
|
|
}
|
|
#endif
|
|
|
|
/*****************************************************************************
|
|
Read a packet from server. Give error message if socket was down
|
|
or packet is an error message
|
|
*****************************************************************************/
|
|
|
|
ulong
|
|
cli_safe_read(MYSQL *mysql)
|
|
{
|
|
NET *net= &mysql->net;
|
|
ulong len=0;
|
|
init_sigpipe_variables
|
|
|
|
/* Don't give sigpipe errors if the client doesn't want them */
|
|
set_sigpipe(mysql);
|
|
if (net->vio != 0)
|
|
len=my_net_read(net);
|
|
reset_sigpipe(mysql);
|
|
|
|
if (len == packet_error || len == 0)
|
|
{
|
|
DBUG_PRINT("error",("Wrong connection or packet. fd: %s len: %lu",
|
|
vio_description(net->vio),len));
|
|
#ifdef MYSQL_SERVER
|
|
if (net->vio && vio_was_interrupted(net->vio))
|
|
return (packet_error);
|
|
#endif /*MYSQL_SERVER*/
|
|
end_server(mysql);
|
|
set_mysql_error(mysql, net->last_errno == ER_NET_PACKET_TOO_LARGE ?
|
|
CR_NET_PACKET_TOO_LARGE: CR_SERVER_LOST, unknown_sqlstate);
|
|
return (packet_error);
|
|
}
|
|
if (net->read_pos[0] == 255)
|
|
{
|
|
if (len > 3)
|
|
{
|
|
char *pos=(char*) net->read_pos+1;
|
|
net->last_errno=uint2korr(pos);
|
|
pos+=2;
|
|
len-=2;
|
|
if (protocol_41(mysql) && pos[0] == '#')
|
|
{
|
|
strmake(net->sqlstate, pos+1, SQLSTATE_LENGTH);
|
|
pos+= SQLSTATE_LENGTH+1;
|
|
}
|
|
(void) strmake(net->last_error,(char*) pos,
|
|
min((uint) len,(uint) sizeof(net->last_error)-1));
|
|
}
|
|
else
|
|
set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);
|
|
/*
|
|
Cover a protocol design error: error packet does not
|
|
contain the server status. Therefore, the client has no way
|
|
to find out whether there are more result sets of
|
|
a multiple-result-set statement pending. Luckily, in 5.0 an
|
|
error always aborts execution of a statement, wherever it is
|
|
a multi-statement or a stored procedure, so it should be
|
|
safe to unconditionally turn off the flag here.
|
|
*/
|
|
mysql->server_status&= ~SERVER_MORE_RESULTS_EXISTS;
|
|
|
|
DBUG_PRINT("error",("Got error: %d/%s (%s)",
|
|
net->last_errno, net->sqlstate, net->last_error));
|
|
return(packet_error);
|
|
}
|
|
return len;
|
|
}
|
|
|
|
void free_rows(MYSQL_DATA *cur)
|
|
{
|
|
if (cur)
|
|
{
|
|
free_root(&cur->alloc,MYF(0));
|
|
my_free((gptr) cur,MYF(0));
|
|
}
|
|
}
|
|
|
|
my_bool
|
|
cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
|
|
const char *header, ulong header_length,
|
|
const char *arg, ulong arg_length, my_bool skip_check,
|
|
MYSQL_STMT *stmt __attribute__((unused)))
|
|
{
|
|
NET *net= &mysql->net;
|
|
my_bool result= 1;
|
|
init_sigpipe_variables
|
|
DBUG_ENTER("cli_advanced_command");
|
|
|
|
/* Don't give sigpipe errors if the client doesn't want them */
|
|
set_sigpipe(mysql);
|
|
|
|
if (mysql->net.vio == 0)
|
|
{ /* Do reconnect if possible */
|
|
if (mysql_reconnect(mysql))
|
|
DBUG_RETURN(1);
|
|
}
|
|
if (mysql->status != MYSQL_STATUS_READY ||
|
|
mysql->server_status & SERVER_MORE_RESULTS_EXISTS)
|
|
{
|
|
DBUG_PRINT("error",("state: %d", mysql->status));
|
|
set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
net->last_error[0]=0;
|
|
net->last_errno= 0;
|
|
strmov(net->sqlstate, not_error_sqlstate);
|
|
mysql->net.report_error=0;
|
|
mysql->info=0;
|
|
mysql->affected_rows= ~(my_ulonglong) 0;
|
|
/*
|
|
We don't want to clear the protocol buffer on COM_QUIT, beacsue if
|
|
the previous command was a shutdown command, we may have the
|
|
response for the COM_QUIT already in the communication buffer
|
|
*/
|
|
net_clear(&mysql->net, (command != COM_QUIT));
|
|
|
|
if (net_write_command(net,(uchar) command, header, header_length,
|
|
arg, arg_length))
|
|
{
|
|
DBUG_PRINT("error",("Can't send command to server. Error: %d",
|
|
socket_errno));
|
|
if (net->last_errno == ER_NET_PACKET_TOO_LARGE)
|
|
{
|
|
net->last_errno=CR_NET_PACKET_TOO_LARGE;
|
|
strmov(net->last_error,ER(net->last_errno));
|
|
goto end;
|
|
}
|
|
end_server(mysql);
|
|
if (mysql_reconnect(mysql))
|
|
goto end;
|
|
if (net_write_command(net,(uchar) command, header, header_length,
|
|
arg, arg_length))
|
|
{
|
|
net->last_errno=CR_SERVER_GONE_ERROR;
|
|
strmov(net->last_error,ER(net->last_errno));
|
|
goto end;
|
|
}
|
|
}
|
|
result=0;
|
|
if (!skip_check)
|
|
result= ((mysql->packet_length=cli_safe_read(mysql)) == packet_error ?
|
|
1 : 0);
|
|
end:
|
|
reset_sigpipe(mysql);
|
|
DBUG_PRINT("exit",("result: %d", result));
|
|
DBUG_RETURN(result);
|
|
}
|
|
|
|
void free_old_query(MYSQL *mysql)
|
|
{
|
|
DBUG_ENTER("free_old_query");
|
|
if (mysql->fields)
|
|
free_root(&mysql->field_alloc,MYF(0));
|
|
init_alloc_root(&mysql->field_alloc,8192,0); /* Assume rowlength < 8192 */
|
|
mysql->fields= 0;
|
|
mysql->field_count= 0; /* For API */
|
|
mysql->warning_count= 0;
|
|
mysql->info= 0;
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/*
|
|
Set the internal error message to mysql handler
|
|
*/
|
|
|
|
void set_mysql_error(MYSQL *mysql, int errcode, const char *sqlstate)
|
|
{
|
|
NET *net;
|
|
DBUG_ENTER("set_mysql_error");
|
|
DBUG_PRINT("enter", ("error :%d '%s'", errcode, ER(errcode)));
|
|
DBUG_ASSERT(mysql != 0);
|
|
|
|
net= &mysql->net;
|
|
net->last_errno= errcode;
|
|
strmov(net->last_error, ER(errcode));
|
|
strmov(net->sqlstate, sqlstate);
|
|
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
static void set_mysql_extended_error(MYSQL *mysql, int errcode,
|
|
const char *sqlstate,
|
|
const char *format, ...)
|
|
{
|
|
NET *net;
|
|
va_list args;
|
|
DBUG_ENTER("set_mysql_extended_error");
|
|
DBUG_PRINT("enter", ("error :%d '%s'", errcode, format));
|
|
DBUG_ASSERT(mysql != 0);
|
|
|
|
net= &mysql->net;
|
|
net->last_errno= errcode;
|
|
va_start(args, format);
|
|
my_vsnprintf(net->last_error, sizeof(net->last_error)-1,
|
|
format, args);
|
|
va_end(args);
|
|
strmov(net->sqlstate, sqlstate);
|
|
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
Flush result set sent from server
|
|
*/
|
|
|
|
static void cli_flush_use_result(MYSQL *mysql)
|
|
{
|
|
/* Clear the current execution status */
|
|
DBUG_ENTER("cli_flush_use_result");
|
|
DBUG_PRINT("warning",("Not all packets read, clearing them"));
|
|
for (;;)
|
|
{
|
|
ulong pkt_len;
|
|
if ((pkt_len=cli_safe_read(mysql)) == packet_error)
|
|
break;
|
|
if (pkt_len <= 8 && mysql->net.read_pos[0] == 254)
|
|
{
|
|
if (protocol_41(mysql))
|
|
{
|
|
char *pos= (char*) mysql->net.read_pos + 1;
|
|
mysql->warning_count=uint2korr(pos); pos+=2;
|
|
mysql->server_status=uint2korr(pos); pos+=2;
|
|
}
|
|
break; /* End of data */
|
|
}
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
#ifdef __WIN__
|
|
static my_bool is_NT(void)
|
|
{
|
|
char *os=getenv("OS");
|
|
return (os && !strcmp(os, "Windows_NT")) ? 1 : 0;
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef CHECK_LICENSE
|
|
/*
|
|
Check server side variable 'license'.
|
|
If the variable does not exist or does not contain 'Commercial',
|
|
we're talking to non-commercial server from commercial client.
|
|
SYNOPSIS
|
|
check_license()
|
|
RETURN VALUE
|
|
0 success
|
|
!0 network error or the server is not commercial.
|
|
Error code is saved in mysql->net.last_errno.
|
|
*/
|
|
|
|
static int check_license(MYSQL *mysql)
|
|
{
|
|
MYSQL_ROW row;
|
|
MYSQL_RES *res;
|
|
NET *net= &mysql->net;
|
|
static const char query[]= "SELECT @@license";
|
|
static const char required_license[]= STRINGIFY_ARG(LICENSE);
|
|
|
|
if (mysql_real_query(mysql, query, sizeof(query)-1))
|
|
{
|
|
if (net->last_errno == ER_UNKNOWN_SYSTEM_VARIABLE)
|
|
{
|
|
net->last_errno= CR_WRONG_LICENSE;
|
|
my_snprintf(net->last_error, sizeof(net->last_error)-1,
|
|
ER(net->last_errno), required_license);
|
|
}
|
|
return 1;
|
|
}
|
|
if (!(res= mysql_use_result(mysql)))
|
|
return 1;
|
|
row= mysql_fetch_row(res);
|
|
/*
|
|
If no rows in result set, or column value is NULL (none of these
|
|
two is ever true for server variables now), or column value
|
|
mismatch, set wrong license error.
|
|
*/
|
|
if (!net->last_errno &&
|
|
(!row || !row[0] ||
|
|
strncmp(row[0], required_license, sizeof(required_license))))
|
|
{
|
|
net->last_errno= CR_WRONG_LICENSE;
|
|
my_snprintf(net->last_error, sizeof(net->last_error)-1,
|
|
ER(net->last_errno), required_license);
|
|
}
|
|
mysql_free_result(res);
|
|
return net->last_errno;
|
|
}
|
|
#endif /* CHECK_LICENSE */
|
|
|
|
|
|
/**************************************************************************
|
|
Shut down connection
|
|
**************************************************************************/
|
|
|
|
void end_server(MYSQL *mysql)
|
|
{
|
|
int save_errno= errno;
|
|
DBUG_ENTER("end_server");
|
|
if (mysql->net.vio != 0)
|
|
{
|
|
init_sigpipe_variables
|
|
DBUG_PRINT("info",("Net: %s", vio_description(mysql->net.vio)));
|
|
set_sigpipe(mysql);
|
|
vio_delete(mysql->net.vio);
|
|
reset_sigpipe(mysql);
|
|
mysql->net.vio= 0; /* Marker */
|
|
}
|
|
net_end(&mysql->net);
|
|
free_old_query(mysql);
|
|
errno= save_errno;
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
void STDCALL
|
|
mysql_free_result(MYSQL_RES *result)
|
|
{
|
|
DBUG_ENTER("mysql_free_result");
|
|
DBUG_PRINT("enter",("mysql_res: 0x%lx", (long) result));
|
|
if (result)
|
|
{
|
|
MYSQL *mysql= result->handle;
|
|
if (mysql)
|
|
{
|
|
if (mysql->unbuffered_fetch_owner == &result->unbuffered_fetch_cancelled)
|
|
mysql->unbuffered_fetch_owner= 0;
|
|
if (mysql->status == MYSQL_STATUS_USE_RESULT)
|
|
{
|
|
(*mysql->methods->flush_use_result)(mysql);
|
|
mysql->status=MYSQL_STATUS_READY;
|
|
if (mysql->unbuffered_fetch_owner)
|
|
*mysql->unbuffered_fetch_owner= TRUE;
|
|
}
|
|
}
|
|
free_rows(result->data);
|
|
if (result->fields)
|
|
free_root(&result->field_alloc,MYF(0));
|
|
if (result->row)
|
|
my_free((gptr) result->row,MYF(0));
|
|
my_free((gptr) result,MYF(0));
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/****************************************************************************
|
|
Get options from my.cnf
|
|
****************************************************************************/
|
|
|
|
static const char *default_options[]=
|
|
{
|
|
"port","socket","compress","password","pipe", "timeout", "user",
|
|
"init-command", "host", "database", "debug", "return-found-rows",
|
|
"ssl-key" ,"ssl-cert" ,"ssl-ca" ,"ssl-capath",
|
|
"character-sets-dir", "default-character-set", "interactive-timeout",
|
|
"connect-timeout", "local-infile", "disable-local-infile",
|
|
"replication-probe", "enable-reads-from-master", "repl-parse-query",
|
|
"ssl-cipher", "max-allowed-packet", "protocol", "shared-memory-base-name",
|
|
"multi-results", "multi-statements", "multi-queries", "secure-auth",
|
|
"report-data-truncation",
|
|
NullS
|
|
};
|
|
|
|
static TYPELIB option_types={array_elements(default_options)-1,
|
|
"options",default_options, NULL};
|
|
|
|
const char *sql_protocol_names_lib[] =
|
|
{ "TCP", "SOCKET", "PIPE", "MEMORY", NullS };
|
|
TYPELIB sql_protocol_typelib = {array_elements(sql_protocol_names_lib)-1,"",
|
|
sql_protocol_names_lib, NULL};
|
|
|
|
static int add_init_command(struct st_mysql_options *options, const char *cmd)
|
|
{
|
|
char *tmp;
|
|
|
|
if (!options->init_commands)
|
|
{
|
|
options->init_commands= (DYNAMIC_ARRAY*)my_malloc(sizeof(DYNAMIC_ARRAY),
|
|
MYF(MY_WME));
|
|
init_dynamic_array(options->init_commands,sizeof(char*),0,5 CALLER_INFO);
|
|
}
|
|
|
|
if (!(tmp= my_strdup(cmd,MYF(MY_WME))) ||
|
|
insert_dynamic(options->init_commands, (gptr)&tmp))
|
|
{
|
|
my_free(tmp, MYF(MY_ALLOW_ZERO_PTR));
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void mysql_read_default_options(struct st_mysql_options *options,
|
|
const char *filename,const char *group)
|
|
{
|
|
int argc;
|
|
char *argv_buff[1],**argv;
|
|
const char *groups[3];
|
|
DBUG_ENTER("mysql_read_default_options");
|
|
DBUG_PRINT("enter",("file: %s group: %s",filename,group ? group :"NULL"));
|
|
|
|
argc=1; argv=argv_buff; argv_buff[0]= (char*) "client";
|
|
groups[0]= (char*) "client"; groups[1]= (char*) group; groups[2]=0;
|
|
|
|
load_defaults(filename, groups, &argc, &argv);
|
|
if (argc != 1) /* If some default option */
|
|
{
|
|
char **option=argv;
|
|
while (*++option)
|
|
{
|
|
/* DBUG_PRINT("info",("option: %s",option[0])); */
|
|
if (option[0][0] == '-' && option[0][1] == '-')
|
|
{
|
|
char *end=strcend(*option,'=');
|
|
char *opt_arg=0;
|
|
if (*end)
|
|
{
|
|
opt_arg=end+1;
|
|
*end=0; /* Remove '=' */
|
|
}
|
|
/* Change all '_' in variable name to '-' */
|
|
for (end= *option ; *(end= strcend(end,'_')) ; )
|
|
*end= '-';
|
|
switch (find_type(*option+2,&option_types,2)) {
|
|
case 1: /* port */
|
|
if (opt_arg)
|
|
options->port=atoi(opt_arg);
|
|
break;
|
|
case 2: /* socket */
|
|
if (opt_arg)
|
|
{
|
|
my_free(options->unix_socket,MYF(MY_ALLOW_ZERO_PTR));
|
|
options->unix_socket=my_strdup(opt_arg,MYF(MY_WME));
|
|
}
|
|
break;
|
|
case 3: /* compress */
|
|
options->compress=1;
|
|
options->client_flag|= CLIENT_COMPRESS;
|
|
break;
|
|
case 4: /* password */
|
|
if (opt_arg)
|
|
{
|
|
my_free(options->password,MYF(MY_ALLOW_ZERO_PTR));
|
|
options->password=my_strdup(opt_arg,MYF(MY_WME));
|
|
}
|
|
break;
|
|
case 5:
|
|
options->protocol = MYSQL_PROTOCOL_PIPE;
|
|
case 20: /* connect_timeout */
|
|
case 6: /* timeout */
|
|
if (opt_arg)
|
|
options->connect_timeout=atoi(opt_arg);
|
|
break;
|
|
case 7: /* user */
|
|
if (opt_arg)
|
|
{
|
|
my_free(options->user,MYF(MY_ALLOW_ZERO_PTR));
|
|
options->user=my_strdup(opt_arg,MYF(MY_WME));
|
|
}
|
|
break;
|
|
case 8: /* init-command */
|
|
add_init_command(options,opt_arg);
|
|
break;
|
|
case 9: /* host */
|
|
if (opt_arg)
|
|
{
|
|
my_free(options->host,MYF(MY_ALLOW_ZERO_PTR));
|
|
options->host=my_strdup(opt_arg,MYF(MY_WME));
|
|
}
|
|
break;
|
|
case 10: /* database */
|
|
if (opt_arg)
|
|
{
|
|
my_free(options->db,MYF(MY_ALLOW_ZERO_PTR));
|
|
options->db=my_strdup(opt_arg,MYF(MY_WME));
|
|
}
|
|
break;
|
|
case 11: /* debug */
|
|
#ifdef MYSQL_CLIENT
|
|
mysql_debug(opt_arg ? opt_arg : "d:t:o,/tmp/client.trace");
|
|
break;
|
|
#endif
|
|
case 12: /* return-found-rows */
|
|
options->client_flag|=CLIENT_FOUND_ROWS;
|
|
break;
|
|
#ifdef HAVE_OPENSSL
|
|
case 13: /* ssl_key */
|
|
my_free(options->ssl_key, MYF(MY_ALLOW_ZERO_PTR));
|
|
options->ssl_key = my_strdup(opt_arg, MYF(MY_WME));
|
|
break;
|
|
case 14: /* ssl_cert */
|
|
my_free(options->ssl_cert, MYF(MY_ALLOW_ZERO_PTR));
|
|
options->ssl_cert = my_strdup(opt_arg, MYF(MY_WME));
|
|
break;
|
|
case 15: /* ssl_ca */
|
|
my_free(options->ssl_ca, MYF(MY_ALLOW_ZERO_PTR));
|
|
options->ssl_ca = my_strdup(opt_arg, MYF(MY_WME));
|
|
break;
|
|
case 16: /* ssl_capath */
|
|
my_free(options->ssl_capath, MYF(MY_ALLOW_ZERO_PTR));
|
|
options->ssl_capath = my_strdup(opt_arg, MYF(MY_WME));
|
|
break;
|
|
#else
|
|
case 13: /* Ignore SSL options */
|
|
case 14:
|
|
case 15:
|
|
case 16:
|
|
break;
|
|
#endif /* HAVE_OPENSSL */
|
|
case 17: /* charset-lib */
|
|
my_free(options->charset_dir,MYF(MY_ALLOW_ZERO_PTR));
|
|
options->charset_dir = my_strdup(opt_arg, MYF(MY_WME));
|
|
break;
|
|
case 18:
|
|
my_free(options->charset_name,MYF(MY_ALLOW_ZERO_PTR));
|
|
options->charset_name = my_strdup(opt_arg, MYF(MY_WME));
|
|
break;
|
|
case 19: /* Interactive-timeout */
|
|
options->client_flag|= CLIENT_INTERACTIVE;
|
|
break;
|
|
case 21:
|
|
if (!opt_arg || atoi(opt_arg) != 0)
|
|
options->client_flag|= CLIENT_LOCAL_FILES;
|
|
else
|
|
options->client_flag&= ~CLIENT_LOCAL_FILES;
|
|
break;
|
|
case 22:
|
|
options->client_flag&= ~CLIENT_LOCAL_FILES;
|
|
break;
|
|
case 23: /* replication probe */
|
|
#ifndef TO_BE_DELETED
|
|
options->rpl_probe= 1;
|
|
#endif
|
|
break;
|
|
case 24: /* enable-reads-from-master */
|
|
options->no_master_reads= 0;
|
|
break;
|
|
case 25: /* repl-parse-query */
|
|
#ifndef TO_BE_DELETED
|
|
options->rpl_parse= 1;
|
|
#endif
|
|
break;
|
|
case 27:
|
|
if (opt_arg)
|
|
options->max_allowed_packet= atoi(opt_arg);
|
|
break;
|
|
case 28: /* protocol */
|
|
if ((options->protocol= find_type(opt_arg,
|
|
&sql_protocol_typelib,0)) <= 0)
|
|
{
|
|
fprintf(stderr, "Unknown option to protocol: %s\n", opt_arg);
|
|
exit(1);
|
|
}
|
|
break;
|
|
case 29: /* shared_memory_base_name */
|
|
#ifdef HAVE_SMEM
|
|
if (options->shared_memory_base_name != def_shared_memory_base_name)
|
|
my_free(options->shared_memory_base_name,MYF(MY_ALLOW_ZERO_PTR));
|
|
options->shared_memory_base_name=my_strdup(opt_arg,MYF(MY_WME));
|
|
#endif
|
|
break;
|
|
case 30:
|
|
options->client_flag|= CLIENT_MULTI_RESULTS;
|
|
break;
|
|
case 31:
|
|
case 32:
|
|
options->client_flag|= CLIENT_MULTI_STATEMENTS | CLIENT_MULTI_RESULTS;
|
|
break;
|
|
case 33: /* secure-auth */
|
|
options->secure_auth= TRUE;
|
|
break;
|
|
case 34: /* report-data-truncation */
|
|
options->report_data_truncation= opt_arg ? test(atoi(opt_arg)) : 1;
|
|
break;
|
|
default:
|
|
DBUG_PRINT("warning",("unknown option: %s",option[0]));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
free_defaults(argv);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/**************************************************************************
|
|
Get column lengths of the current row
|
|
If one uses mysql_use_result, res->lengths contains the length information,
|
|
else the lengths are calculated from the offset between pointers.
|
|
**************************************************************************/
|
|
|
|
static void cli_fetch_lengths(ulong *to, MYSQL_ROW column,
|
|
unsigned int field_count)
|
|
{
|
|
ulong *prev_length;
|
|
byte *start=0;
|
|
MYSQL_ROW end;
|
|
|
|
prev_length=0; /* Keep gcc happy */
|
|
for (end=column + field_count + 1 ; column != end ; column++, to++)
|
|
{
|
|
if (!*column)
|
|
{
|
|
*to= 0; /* Null */
|
|
continue;
|
|
}
|
|
if (start) /* Found end of prev string */
|
|
*prev_length= (ulong) (*column-start-1);
|
|
start= *column;
|
|
prev_length= to;
|
|
}
|
|
}
|
|
|
|
/***************************************************************************
|
|
Change field rows to field structs
|
|
***************************************************************************/
|
|
|
|
MYSQL_FIELD *
|
|
unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
|
|
my_bool default_value, uint server_capabilities)
|
|
{
|
|
MYSQL_ROWS *row;
|
|
MYSQL_FIELD *field,*result;
|
|
ulong lengths[9]; /* Max of fields */
|
|
DBUG_ENTER("unpack_fields");
|
|
|
|
field= result= (MYSQL_FIELD*) alloc_root(alloc,
|
|
(uint) sizeof(*field)*fields);
|
|
if (!result)
|
|
{
|
|
free_rows(data); /* Free old data */
|
|
DBUG_RETURN(0);
|
|
}
|
|
bzero((char*) field, (uint) sizeof(MYSQL_FIELD)*fields);
|
|
if (server_capabilities & CLIENT_PROTOCOL_41)
|
|
{
|
|
/* server is 4.1, and returns the new field result format */
|
|
for (row=data->data; row ; row = row->next,field++)
|
|
{
|
|
uchar *pos;
|
|
/* fields count may be wrong */
|
|
DBUG_ASSERT((uint) (field - result) < fields);
|
|
cli_fetch_lengths(&lengths[0], row->data, default_value ? 8 : 7);
|
|
field->catalog = strdup_root(alloc,(char*) row->data[0]);
|
|
field->db = strdup_root(alloc,(char*) row->data[1]);
|
|
field->table = strdup_root(alloc,(char*) row->data[2]);
|
|
field->org_table= strdup_root(alloc,(char*) row->data[3]);
|
|
field->name = strdup_root(alloc,(char*) row->data[4]);
|
|
field->org_name = strdup_root(alloc,(char*) row->data[5]);
|
|
|
|
field->catalog_length= lengths[0];
|
|
field->db_length= lengths[1];
|
|
field->table_length= lengths[2];
|
|
field->org_table_length= lengths[3];
|
|
field->name_length= lengths[4];
|
|
field->org_name_length= lengths[5];
|
|
|
|
/* Unpack fixed length parts */
|
|
pos= (uchar*) row->data[6];
|
|
field->charsetnr= uint2korr(pos);
|
|
field->length= (uint) uint4korr(pos+2);
|
|
field->type= (enum enum_field_types) pos[6];
|
|
field->flags= uint2korr(pos+7);
|
|
field->decimals= (uint) pos[9];
|
|
|
|
if (INTERNAL_NUM_FIELD(field))
|
|
field->flags|= NUM_FLAG;
|
|
if (default_value && row->data[7])
|
|
{
|
|
field->def=strdup_root(alloc,(char*) row->data[7]);
|
|
field->def_length= lengths[7];
|
|
}
|
|
else
|
|
field->def=0;
|
|
field->max_length= 0;
|
|
}
|
|
}
|
|
#ifndef DELETE_SUPPORT_OF_4_0_PROTOCOL
|
|
else
|
|
{
|
|
/* old protocol, for backward compatibility */
|
|
for (row=data->data; row ; row = row->next,field++)
|
|
{
|
|
cli_fetch_lengths(&lengths[0], row->data, default_value ? 6 : 5);
|
|
field->org_table= field->table= strdup_root(alloc,(char*) row->data[0]);
|
|
field->name= strdup_root(alloc,(char*) row->data[1]);
|
|
field->length= (uint) uint3korr(row->data[2]);
|
|
field->type= (enum enum_field_types) (uchar) row->data[3][0];
|
|
|
|
field->catalog=(char*) "";
|
|
field->db= (char*) "";
|
|
field->catalog_length= 0;
|
|
field->db_length= 0;
|
|
field->org_table_length= field->table_length= lengths[0];
|
|
field->name_length= lengths[1];
|
|
|
|
if (server_capabilities & CLIENT_LONG_FLAG)
|
|
{
|
|
field->flags= uint2korr(row->data[4]);
|
|
field->decimals=(uint) (uchar) row->data[4][2];
|
|
}
|
|
else
|
|
{
|
|
field->flags= (uint) (uchar) row->data[4][0];
|
|
field->decimals=(uint) (uchar) row->data[4][1];
|
|
}
|
|
if (INTERNAL_NUM_FIELD(field))
|
|
field->flags|= NUM_FLAG;
|
|
if (default_value && row->data[5])
|
|
{
|
|
field->def=strdup_root(alloc,(char*) row->data[5]);
|
|
field->def_length= lengths[5];
|
|
}
|
|
else
|
|
field->def=0;
|
|
field->max_length= 0;
|
|
}
|
|
}
|
|
#endif /* DELETE_SUPPORT_OF_4_0_PROTOCOL */
|
|
free_rows(data); /* Free old data */
|
|
DBUG_RETURN(result);
|
|
}
|
|
|
|
/* Read all rows (fields or data) from server */
|
|
|
|
MYSQL_DATA *cli_read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
|
|
unsigned int fields)
|
|
{
|
|
uint field;
|
|
ulong pkt_len;
|
|
ulong len;
|
|
uchar *cp;
|
|
char *to, *end_to;
|
|
MYSQL_DATA *result;
|
|
MYSQL_ROWS **prev_ptr,*cur;
|
|
NET *net = &mysql->net;
|
|
DBUG_ENTER("cli_read_rows");
|
|
|
|
if ((pkt_len= cli_safe_read(mysql)) == packet_error)
|
|
DBUG_RETURN(0);
|
|
if (!(result=(MYSQL_DATA*) my_malloc(sizeof(MYSQL_DATA),
|
|
MYF(MY_WME | MY_ZEROFILL))))
|
|
{
|
|
set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
|
|
DBUG_RETURN(0);
|
|
}
|
|
init_alloc_root(&result->alloc,8192,0); /* Assume rowlength < 8192 */
|
|
result->alloc.min_malloc=sizeof(MYSQL_ROWS);
|
|
prev_ptr= &result->data;
|
|
result->rows=0;
|
|
result->fields=fields;
|
|
|
|
/*
|
|
The last EOF packet is either a single 254 character or (in MySQL 4.1)
|
|
254 followed by 1-7 status bytes.
|
|
|
|
This doesn't conflict with normal usage of 254 which stands for a
|
|
string where the length of the string is 8 bytes. (see net_field_length())
|
|
*/
|
|
|
|
while (*(cp=net->read_pos) != 254 || pkt_len >= 8)
|
|
{
|
|
result->rows++;
|
|
if (!(cur= (MYSQL_ROWS*) alloc_root(&result->alloc,
|
|
sizeof(MYSQL_ROWS))) ||
|
|
!(cur->data= ((MYSQL_ROW)
|
|
alloc_root(&result->alloc,
|
|
(fields+1)*sizeof(char *)+pkt_len))))
|
|
{
|
|
free_rows(result);
|
|
set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
|
|
DBUG_RETURN(0);
|
|
}
|
|
*prev_ptr=cur;
|
|
prev_ptr= &cur->next;
|
|
to= (char*) (cur->data+fields+1);
|
|
end_to=to+pkt_len-1;
|
|
for (field=0 ; field < fields ; field++)
|
|
{
|
|
if ((len=(ulong) net_field_length(&cp)) == NULL_LENGTH)
|
|
{ /* null field */
|
|
cur->data[field] = 0;
|
|
}
|
|
else
|
|
{
|
|
cur->data[field] = to;
|
|
if (len > (ulong) (end_to - to))
|
|
{
|
|
free_rows(result);
|
|
set_mysql_error(mysql, CR_MALFORMED_PACKET, unknown_sqlstate);
|
|
DBUG_RETURN(0);
|
|
}
|
|
memcpy(to,(char*) cp,len); to[len]=0;
|
|
to+=len+1;
|
|
cp+=len;
|
|
if (mysql_fields)
|
|
{
|
|
if (mysql_fields[field].max_length < len)
|
|
mysql_fields[field].max_length=len;
|
|
}
|
|
}
|
|
}
|
|
cur->data[field]=to; /* End of last field */
|
|
if ((pkt_len=cli_safe_read(mysql)) == packet_error)
|
|
{
|
|
free_rows(result);
|
|
DBUG_RETURN(0);
|
|
}
|
|
}
|
|
*prev_ptr=0; /* last pointer is null */
|
|
if (pkt_len > 1) /* MySQL 4.1 protocol */
|
|
{
|
|
mysql->warning_count= uint2korr(cp+1);
|
|
mysql->server_status= uint2korr(cp+3);
|
|
DBUG_PRINT("info",("status: %u warning_count: %u",
|
|
mysql->server_status, mysql->warning_count));
|
|
}
|
|
DBUG_PRINT("exit", ("Got %lu rows", (ulong) result->rows));
|
|
DBUG_RETURN(result);
|
|
}
|
|
|
|
/*
|
|
Read one row. Uses packet buffer as storage for fields.
|
|
When next packet is read, the previous field values are destroyed
|
|
*/
|
|
|
|
|
|
static int
|
|
read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths)
|
|
{
|
|
uint field;
|
|
ulong pkt_len,len;
|
|
uchar *pos, *prev_pos, *end_pos;
|
|
NET *net= &mysql->net;
|
|
|
|
if ((pkt_len=cli_safe_read(mysql)) == packet_error)
|
|
return -1;
|
|
if (pkt_len <= 8 && net->read_pos[0] == 254)
|
|
{
|
|
if (pkt_len > 1) /* MySQL 4.1 protocol */
|
|
{
|
|
mysql->warning_count= uint2korr(net->read_pos+1);
|
|
mysql->server_status= uint2korr(net->read_pos+3);
|
|
}
|
|
return 1; /* End of data */
|
|
}
|
|
prev_pos= 0; /* allowed to write at packet[-1] */
|
|
pos=net->read_pos;
|
|
end_pos=pos+pkt_len;
|
|
for (field=0 ; field < fields ; field++)
|
|
{
|
|
if ((len=(ulong) net_field_length(&pos)) == NULL_LENGTH)
|
|
{ /* null field */
|
|
row[field] = 0;
|
|
*lengths++=0;
|
|
}
|
|
else
|
|
{
|
|
if (len > (ulong) (end_pos - pos))
|
|
{
|
|
set_mysql_error(mysql, CR_UNKNOWN_ERROR, unknown_sqlstate);
|
|
return -1;
|
|
}
|
|
row[field] = (char*) pos;
|
|
pos+=len;
|
|
*lengths++=len;
|
|
}
|
|
if (prev_pos)
|
|
*prev_pos=0; /* Terminate prev field */
|
|
prev_pos=pos;
|
|
}
|
|
row[field]=(char*) prev_pos+1; /* End of last field */
|
|
*prev_pos=0; /* Terminate last field */
|
|
return 0;
|
|
}
|
|
|
|
|
|
/****************************************************************************
|
|
Init MySQL structure or allocate one
|
|
****************************************************************************/
|
|
|
|
MYSQL * STDCALL
|
|
mysql_init(MYSQL *mysql)
|
|
{
|
|
if (mysql_server_init(0, NULL, NULL))
|
|
return 0;
|
|
if (!mysql)
|
|
{
|
|
if (!(mysql=(MYSQL*) my_malloc(sizeof(*mysql),MYF(MY_WME | MY_ZEROFILL))))
|
|
return 0;
|
|
mysql->free_me=1;
|
|
}
|
|
else
|
|
bzero((char*) (mysql), sizeof(*(mysql)));
|
|
mysql->options.connect_timeout= CONNECT_TIMEOUT;
|
|
mysql->last_used_con= mysql->next_slave= mysql->master = mysql;
|
|
mysql->charset=default_client_charset_info;
|
|
strmov(mysql->net.sqlstate, not_error_sqlstate);
|
|
/*
|
|
By default, we are a replication pivot. The caller must reset it
|
|
after we return if this is not the case.
|
|
*/
|
|
#ifndef TO_BE_DELETED
|
|
mysql->rpl_pivot = 1;
|
|
#endif
|
|
|
|
/*
|
|
Only enable LOAD DATA INFILE by default if configured with
|
|
--enable-local-infile
|
|
*/
|
|
|
|
#if defined(ENABLED_LOCAL_INFILE) && !defined(MYSQL_SERVER)
|
|
mysql->options.client_flag|= CLIENT_LOCAL_FILES;
|
|
#endif
|
|
|
|
#ifdef HAVE_SMEM
|
|
mysql->options.shared_memory_base_name= (char*) def_shared_memory_base_name;
|
|
#endif
|
|
|
|
mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
|
|
mysql->options.report_data_truncation= TRUE; /* default */
|
|
|
|
/*
|
|
By default we don't reconnect because it could silently corrupt data (after
|
|
reconnection you potentially lose table locks, user variables, session
|
|
variables (transactions but they are specifically dealt with in
|
|
mysql_reconnect()).
|
|
This is a change: < 5.0.3 mysql->reconnect was set to 1 by default.
|
|
How this change impacts existing apps:
|
|
- existing apps which relyed on the default will see a behaviour change;
|
|
they will have to set reconnect=1 after mysql_real_connect().
|
|
- existing apps which explicitely asked for reconnection (the only way they
|
|
could do it was by setting mysql.reconnect to 1 after mysql_real_connect())
|
|
will not see a behaviour change.
|
|
- existing apps which explicitely asked for no reconnection
|
|
(mysql.reconnect=0) will not see a behaviour change.
|
|
*/
|
|
mysql->reconnect= 0;
|
|
|
|
return mysql;
|
|
}
|
|
|
|
|
|
/*
|
|
Fill in SSL part of MYSQL structure and set 'use_ssl' flag.
|
|
NB! Errors are not reported until you do mysql_real_connect.
|
|
*/
|
|
|
|
#define strdup_if_not_null(A) (A) == 0 ? 0 : my_strdup((A),MYF(MY_WME))
|
|
|
|
my_bool STDCALL
|
|
mysql_ssl_set(MYSQL *mysql __attribute__((unused)) ,
|
|
const char *key __attribute__((unused)),
|
|
const char *cert __attribute__((unused)),
|
|
const char *ca __attribute__((unused)),
|
|
const char *capath __attribute__((unused)),
|
|
const char *cipher __attribute__((unused)))
|
|
{
|
|
DBUG_ENTER("mysql_ssl_set");
|
|
#ifdef HAVE_OPENSSL
|
|
mysql->options.ssl_key= strdup_if_not_null(key);
|
|
mysql->options.ssl_cert= strdup_if_not_null(cert);
|
|
mysql->options.ssl_ca= strdup_if_not_null(ca);
|
|
mysql->options.ssl_capath= strdup_if_not_null(capath);
|
|
mysql->options.ssl_cipher= strdup_if_not_null(cipher);
|
|
#endif /* HAVE_OPENSSL */
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/*
|
|
Free strings in the SSL structure and clear 'use_ssl' flag.
|
|
NB! Errors are not reported until you do mysql_real_connect.
|
|
*/
|
|
|
|
#ifdef HAVE_OPENSSL
|
|
|
|
static void
|
|
mysql_ssl_free(MYSQL *mysql __attribute__((unused)))
|
|
{
|
|
struct st_VioSSLFd *ssl_fd= (struct st_VioSSLFd*) mysql->connector_fd;
|
|
DBUG_ENTER("mysql_ssl_free");
|
|
|
|
my_free(mysql->options.ssl_key, MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.ssl_cert, MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.ssl_ca, MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.ssl_capath, MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.ssl_cipher, MYF(MY_ALLOW_ZERO_PTR));
|
|
if (ssl_fd)
|
|
SSL_CTX_free(ssl_fd->ssl_context);
|
|
my_free(mysql->connector_fd,MYF(MY_ALLOW_ZERO_PTR));
|
|
mysql->options.ssl_key = 0;
|
|
mysql->options.ssl_cert = 0;
|
|
mysql->options.ssl_ca = 0;
|
|
mysql->options.ssl_capath = 0;
|
|
mysql->options.ssl_cipher= 0;
|
|
mysql->options.use_ssl = FALSE;
|
|
mysql->connector_fd = 0;
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
#endif /* HAVE_OPENSSL */
|
|
|
|
/*
|
|
Return the SSL cipher (if any) used for current
|
|
connection to the server.
|
|
|
|
SYNOPSYS
|
|
mysql_get_ssl_cipher()
|
|
mysql pointer to the mysql connection
|
|
|
|
*/
|
|
|
|
const char * STDCALL
|
|
mysql_get_ssl_cipher(MYSQL *mysql)
|
|
{
|
|
DBUG_ENTER("mysql_get_ssl_cipher");
|
|
#ifdef HAVE_OPENSSL
|
|
if (mysql->net.vio && mysql->net.vio->ssl_arg)
|
|
DBUG_RETURN(SSL_get_cipher_name((SSL*)mysql->net.vio->ssl_arg));
|
|
#endif /* HAVE_OPENSSL */
|
|
DBUG_RETURN(NULL);
|
|
}
|
|
|
|
|
|
/*
|
|
Check the server's (subject) Common Name against the
|
|
hostname we connected to
|
|
|
|
SYNOPSIS
|
|
ssl_verify_server_cert()
|
|
vio pointer to a SSL connected vio
|
|
server_hostname name of the server that we connected to
|
|
|
|
RETURN VALUES
|
|
0 Success
|
|
1 Failed to validate server
|
|
|
|
*/
|
|
|
|
#ifdef HAVE_OPENSSL
|
|
|
|
static int ssl_verify_server_cert(Vio *vio, const char* server_hostname)
|
|
{
|
|
SSL *ssl;
|
|
X509 *server_cert;
|
|
char *cp1, *cp2;
|
|
char buf[256];
|
|
DBUG_ENTER("ssl_verify_server_cert");
|
|
DBUG_PRINT("enter", ("server_hostname: %s", server_hostname));
|
|
|
|
if (!(ssl= (SSL*)vio->ssl_arg))
|
|
{
|
|
DBUG_PRINT("error", ("No SSL pointer found"));
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
if (!server_hostname)
|
|
{
|
|
DBUG_PRINT("error", ("No server hostname supplied"));
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
if (!(server_cert= SSL_get_peer_certificate(ssl)))
|
|
{
|
|
DBUG_PRINT("error", ("Could not get server certificate"));
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
/*
|
|
We already know that the certificate exchanged was valid; the SSL library
|
|
handled that. Now we need to verify that the contents of the certificate
|
|
are what we expect.
|
|
*/
|
|
|
|
X509_NAME_oneline(X509_get_subject_name(server_cert), buf, sizeof(buf));
|
|
X509_free (server_cert);
|
|
|
|
DBUG_PRINT("info", ("hostname in cert: %s", buf));
|
|
cp1= strstr(buf, "/CN=");
|
|
if (cp1)
|
|
{
|
|
cp1+= 4; /* Skip the "/CN=" that we found */
|
|
/* Search for next / which might be the delimiter for email */
|
|
cp2= strchr(cp1, '/');
|
|
if (cp2)
|
|
*cp2= '\0';
|
|
DBUG_PRINT("info", ("Server hostname in cert: %s", cp1));
|
|
if (!strcmp(cp1, server_hostname))
|
|
{
|
|
/* Success */
|
|
DBUG_RETURN(0);
|
|
}
|
|
}
|
|
DBUG_PRINT("error", ("SSL certificate validation failure"));
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
#endif /* HAVE_OPENSSL */
|
|
|
|
|
|
/*
|
|
Note that the mysql argument must be initialized with mysql_init()
|
|
before calling mysql_real_connect !
|
|
*/
|
|
|
|
static my_bool cli_read_query_result(MYSQL *mysql);
|
|
static MYSQL_RES *cli_use_result(MYSQL *mysql);
|
|
|
|
static MYSQL_METHODS client_methods=
|
|
{
|
|
cli_read_query_result, /* read_query_result */
|
|
cli_advanced_command, /* advanced_command */
|
|
cli_read_rows, /* read_rows */
|
|
cli_use_result, /* use_result */
|
|
cli_fetch_lengths, /* fetch_lengths */
|
|
cli_flush_use_result /* flush_use_result */
|
|
#ifndef MYSQL_SERVER
|
|
,cli_list_fields, /* list_fields */
|
|
cli_read_prepare_result, /* read_prepare_result */
|
|
cli_stmt_execute, /* stmt_execute */
|
|
cli_read_binary_rows, /* read_binary_rows */
|
|
cli_unbuffered_fetch, /* unbuffered_fetch */
|
|
NULL, /* free_embedded_thd */
|
|
cli_read_statistics, /* read_statistics */
|
|
cli_read_query_result, /* next_result */
|
|
cli_read_change_user_result, /* read_change_user_result */
|
|
cli_read_binary_rows /* read_rows_from_cursor */
|
|
#endif
|
|
};
|
|
|
|
C_MODE_START
|
|
int mysql_init_character_set(MYSQL *mysql)
|
|
{
|
|
NET *net= &mysql->net;
|
|
const char *default_collation_name;
|
|
|
|
/* Set character set */
|
|
if (!mysql->options.charset_name)
|
|
{
|
|
default_collation_name= MYSQL_DEFAULT_COLLATION_NAME;
|
|
if (!(mysql->options.charset_name=
|
|
my_strdup(MYSQL_DEFAULT_CHARSET_NAME,MYF(MY_WME))))
|
|
return 1;
|
|
}
|
|
else
|
|
default_collation_name= NULL;
|
|
|
|
{
|
|
const char *save= charsets_dir;
|
|
if (mysql->options.charset_dir)
|
|
charsets_dir=mysql->options.charset_dir;
|
|
mysql->charset=get_charset_by_csname(mysql->options.charset_name,
|
|
MY_CS_PRIMARY, MYF(MY_WME));
|
|
if (mysql->charset && default_collation_name)
|
|
{
|
|
CHARSET_INFO *collation;
|
|
if ((collation=
|
|
get_charset_by_name(default_collation_name, MYF(MY_WME))))
|
|
{
|
|
if (!my_charset_same(mysql->charset, collation))
|
|
{
|
|
my_printf_error(ER_UNKNOWN_ERROR,
|
|
"COLLATION %s is not valid for CHARACTER SET %s",
|
|
MYF(0),
|
|
default_collation_name, mysql->options.charset_name);
|
|
mysql->charset= NULL;
|
|
}
|
|
else
|
|
{
|
|
mysql->charset= collation;
|
|
}
|
|
}
|
|
else
|
|
mysql->charset= NULL;
|
|
}
|
|
charsets_dir= save;
|
|
}
|
|
|
|
if (!mysql->charset)
|
|
{
|
|
net->last_errno=CR_CANT_READ_CHARSET;
|
|
strmov(net->sqlstate, unknown_sqlstate);
|
|
if (mysql->options.charset_dir)
|
|
my_snprintf(net->last_error, sizeof(net->last_error)-1,
|
|
ER(net->last_errno),
|
|
mysql->options.charset_name,
|
|
mysql->options.charset_dir);
|
|
else
|
|
{
|
|
char cs_dir_name[FN_REFLEN];
|
|
get_charsets_dir(cs_dir_name);
|
|
my_snprintf(net->last_error, sizeof(net->last_error)-1,
|
|
ER(net->last_errno),
|
|
mysql->options.charset_name,
|
|
cs_dir_name);
|
|
}
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
C_MODE_END
|
|
|
|
|
|
MYSQL * STDCALL
|
|
CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
|
|
const char *passwd, const char *db,
|
|
uint port, const char *unix_socket,ulong client_flag)
|
|
{
|
|
char buff[NAME_LEN+USERNAME_LENGTH+100];
|
|
char *end,*host_info;
|
|
my_socket sock;
|
|
in_addr_t ip_addr;
|
|
struct sockaddr_in sock_addr;
|
|
ulong pkt_length;
|
|
NET *net= &mysql->net;
|
|
#ifdef MYSQL_SERVER
|
|
thr_alarm_t alarmed;
|
|
ALARM alarm_buff;
|
|
#endif
|
|
#ifdef __WIN__
|
|
HANDLE hPipe=INVALID_HANDLE_VALUE;
|
|
#endif
|
|
#ifdef HAVE_SYS_UN_H
|
|
struct sockaddr_un UNIXaddr;
|
|
#endif
|
|
init_sigpipe_variables
|
|
DBUG_ENTER("mysql_real_connect");
|
|
LINT_INIT(host_info);
|
|
|
|
DBUG_PRINT("enter",("host: %s db: %s user: %s",
|
|
host ? host : "(Null)",
|
|
db ? db : "(Null)",
|
|
user ? user : "(Null)"));
|
|
|
|
/* Don't give sigpipe errors if the client doesn't want them */
|
|
set_sigpipe(mysql);
|
|
mysql->methods= &client_methods;
|
|
net->vio = 0; /* If something goes wrong */
|
|
mysql->client_flag=0; /* For handshake */
|
|
|
|
/* use default options */
|
|
if (mysql->options.my_cnf_file || mysql->options.my_cnf_group)
|
|
{
|
|
mysql_read_default_options(&mysql->options,
|
|
(mysql->options.my_cnf_file ?
|
|
mysql->options.my_cnf_file : "my"),
|
|
mysql->options.my_cnf_group);
|
|
my_free(mysql->options.my_cnf_file,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.my_cnf_group,MYF(MY_ALLOW_ZERO_PTR));
|
|
mysql->options.my_cnf_file=mysql->options.my_cnf_group=0;
|
|
}
|
|
|
|
/* Some empty-string-tests are done because of ODBC */
|
|
if (!host || !host[0])
|
|
host=mysql->options.host;
|
|
if (!user || !user[0])
|
|
{
|
|
user=mysql->options.user;
|
|
if (!user)
|
|
user= "";
|
|
}
|
|
if (!passwd)
|
|
{
|
|
passwd=mysql->options.password;
|
|
#if !defined(DONT_USE_MYSQL_PWD) && !defined(MYSQL_SERVER)
|
|
if (!passwd)
|
|
passwd=getenv("MYSQL_PWD"); /* get it from environment */
|
|
#endif
|
|
if (!passwd)
|
|
passwd= "";
|
|
}
|
|
if (!db || !db[0])
|
|
db=mysql->options.db;
|
|
if (!port)
|
|
port=mysql->options.port;
|
|
if (!unix_socket)
|
|
unix_socket=mysql->options.unix_socket;
|
|
|
|
mysql->server_status=SERVER_STATUS_AUTOCOMMIT;
|
|
|
|
/*
|
|
Part 0: Grab a socket and connect it to the server
|
|
*/
|
|
#if defined(HAVE_SMEM)
|
|
if ((!mysql->options.protocol ||
|
|
mysql->options.protocol == MYSQL_PROTOCOL_MEMORY) &&
|
|
(!host || !strcmp(host,LOCAL_HOST)))
|
|
{
|
|
if ((create_shared_memory(mysql,net, mysql->options.connect_timeout)) ==
|
|
INVALID_HANDLE_VALUE)
|
|
{
|
|
DBUG_PRINT("error",
|
|
("host: '%s' socket: '%s' shared memory: %s have_tcpip: %d",
|
|
host ? host : "<null>",
|
|
unix_socket ? unix_socket : "<null>",
|
|
(int) mysql->options.shared_memory_base_name,
|
|
(int) have_tcpip));
|
|
if (mysql->options.protocol == MYSQL_PROTOCOL_MEMORY)
|
|
goto error;
|
|
/* Try also with PIPE or TCP/IP */
|
|
}
|
|
else
|
|
{
|
|
mysql->options.protocol=MYSQL_PROTOCOL_MEMORY;
|
|
sock=0;
|
|
unix_socket = 0;
|
|
host=mysql->options.shared_memory_base_name;
|
|
my_snprintf(host_info=buff, sizeof(buff)-1,
|
|
ER(CR_SHARED_MEMORY_CONNECTION), host);
|
|
}
|
|
}
|
|
#endif /* HAVE_SMEM */
|
|
#if defined(HAVE_SYS_UN_H)
|
|
if (!net->vio &&
|
|
(!mysql->options.protocol ||
|
|
mysql->options.protocol == MYSQL_PROTOCOL_SOCKET) &&
|
|
(unix_socket || mysql_unix_port) &&
|
|
(!host || !strcmp(host,LOCAL_HOST)))
|
|
{
|
|
host=LOCAL_HOST;
|
|
if (!unix_socket)
|
|
unix_socket=mysql_unix_port;
|
|
host_info=(char*) ER(CR_LOCALHOST_CONNECTION);
|
|
DBUG_PRINT("info",("Using UNIX sock '%s'",unix_socket));
|
|
if ((sock = socket(AF_UNIX,SOCK_STREAM,0)) == SOCKET_ERROR)
|
|
{
|
|
net->last_errno=CR_SOCKET_CREATE_ERROR;
|
|
strmov(net->sqlstate, unknown_sqlstate);
|
|
my_snprintf(net->last_error,sizeof(net->last_error)-1,
|
|
ER(net->last_errno),socket_errno);
|
|
goto error;
|
|
}
|
|
net->vio= vio_new(sock, VIO_TYPE_SOCKET,
|
|
VIO_LOCALHOST | VIO_BUFFERED_READ);
|
|
bzero((char*) &UNIXaddr,sizeof(UNIXaddr));
|
|
UNIXaddr.sun_family = AF_UNIX;
|
|
strmake(UNIXaddr.sun_path, unix_socket, sizeof(UNIXaddr.sun_path)-1);
|
|
if (my_connect(sock,(struct sockaddr *) &UNIXaddr, sizeof(UNIXaddr),
|
|
mysql->options.connect_timeout))
|
|
{
|
|
DBUG_PRINT("error",("Got error %d on connect to local server",
|
|
socket_errno));
|
|
net->last_errno=CR_CONNECTION_ERROR;
|
|
strmov(net->sqlstate, unknown_sqlstate);
|
|
my_snprintf(net->last_error,sizeof(net->last_error)-1,
|
|
ER(net->last_errno),unix_socket,socket_errno);
|
|
goto error;
|
|
}
|
|
mysql->options.protocol=MYSQL_PROTOCOL_SOCKET;
|
|
}
|
|
#elif defined(__WIN__)
|
|
if (!net->vio &&
|
|
(mysql->options.protocol == MYSQL_PROTOCOL_PIPE ||
|
|
(host && !strcmp(host,LOCAL_HOST_NAMEDPIPE)) ||
|
|
(! have_tcpip && (unix_socket || !host && is_NT()))))
|
|
{
|
|
sock=0;
|
|
if ((hPipe=create_named_pipe(net, mysql->options.connect_timeout,
|
|
(char**) &host, (char**) &unix_socket)) ==
|
|
INVALID_HANDLE_VALUE)
|
|
{
|
|
DBUG_PRINT("error",
|
|
("host: '%s' socket: '%s' have_tcpip: %d",
|
|
host ? host : "<null>",
|
|
unix_socket ? unix_socket : "<null>",
|
|
(int) have_tcpip));
|
|
if (mysql->options.protocol == MYSQL_PROTOCOL_PIPE ||
|
|
(host && !strcmp(host,LOCAL_HOST_NAMEDPIPE)) ||
|
|
(unix_socket && !strcmp(unix_socket,MYSQL_NAMEDPIPE)))
|
|
goto error;
|
|
/* Try also with TCP/IP */
|
|
}
|
|
else
|
|
{
|
|
net->vio=vio_new_win32pipe(hPipe);
|
|
my_snprintf(host_info=buff, sizeof(buff)-1,
|
|
ER(CR_NAMEDPIPE_CONNECTION), unix_socket);
|
|
}
|
|
}
|
|
#endif
|
|
if (!net->vio &&
|
|
(!mysql->options.protocol ||
|
|
mysql->options.protocol == MYSQL_PROTOCOL_TCP))
|
|
{
|
|
unix_socket=0; /* This is not used */
|
|
if (!port)
|
|
port=mysql_port;
|
|
if (!host)
|
|
host=LOCAL_HOST;
|
|
my_snprintf(host_info=buff,sizeof(buff)-1,ER(CR_TCP_CONNECTION),host);
|
|
DBUG_PRINT("info",("Server name: '%s'. TCP sock: %d", host,port));
|
|
#ifdef MYSQL_SERVER
|
|
thr_alarm_init(&alarmed);
|
|
thr_alarm(&alarmed, mysql->options.connect_timeout, &alarm_buff);
|
|
#endif
|
|
/* _WIN64 ; Assume that the (int) range is enough for socket() */
|
|
sock = (my_socket) socket(AF_INET,SOCK_STREAM,0);
|
|
#ifdef MYSQL_SERVER
|
|
thr_end_alarm(&alarmed);
|
|
#endif
|
|
if (sock == SOCKET_ERROR)
|
|
{
|
|
net->last_errno=CR_IPSOCK_ERROR;
|
|
strmov(net->sqlstate, unknown_sqlstate);
|
|
my_snprintf(net->last_error,sizeof(net->last_error)-1,
|
|
ER(net->last_errno),socket_errno);
|
|
goto error;
|
|
}
|
|
net->vio= vio_new(sock, VIO_TYPE_TCPIP, VIO_BUFFERED_READ);
|
|
bzero((char*) &sock_addr,sizeof(sock_addr));
|
|
sock_addr.sin_family = AF_INET;
|
|
|
|
/*
|
|
The server name may be a host name or IP address
|
|
*/
|
|
|
|
if ((int) (ip_addr = inet_addr(host)) != (int) INADDR_NONE)
|
|
{
|
|
memcpy_fixed(&sock_addr.sin_addr,&ip_addr,sizeof(ip_addr));
|
|
}
|
|
else
|
|
{
|
|
int tmp_errno;
|
|
struct hostent tmp_hostent,*hp;
|
|
char buff2[GETHOSTBYNAME_BUFF_SIZE];
|
|
hp = my_gethostbyname_r(host,&tmp_hostent,buff2,sizeof(buff2),
|
|
&tmp_errno);
|
|
if (!hp)
|
|
{
|
|
my_gethostbyname_r_free();
|
|
net->last_errno=CR_UNKNOWN_HOST;
|
|
strmov(net->sqlstate, unknown_sqlstate);
|
|
my_snprintf(net->last_error, sizeof(net->last_error)-1,
|
|
ER(CR_UNKNOWN_HOST), host, tmp_errno);
|
|
goto error;
|
|
}
|
|
memcpy(&sock_addr.sin_addr, hp->h_addr,
|
|
min(sizeof(sock_addr.sin_addr), (size_t) hp->h_length));
|
|
my_gethostbyname_r_free();
|
|
}
|
|
sock_addr.sin_port = (ushort) htons((ushort) port);
|
|
if (my_connect(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr),
|
|
mysql->options.connect_timeout))
|
|
{
|
|
DBUG_PRINT("error",("Got error %d on connect to '%s'",socket_errno,
|
|
host));
|
|
net->last_errno= CR_CONN_HOST_ERROR;
|
|
strmov(net->sqlstate, unknown_sqlstate);
|
|
my_snprintf(net->last_error, sizeof(net->last_error)-1,
|
|
ER(CR_CONN_HOST_ERROR), host, socket_errno);
|
|
goto error;
|
|
}
|
|
}
|
|
if (!net->vio)
|
|
{
|
|
DBUG_PRINT("error",("Unknow protocol %d ",mysql->options.protocol));
|
|
set_mysql_error(mysql, CR_CONN_UNKNOW_PROTOCOL, unknown_sqlstate);
|
|
goto error;
|
|
}
|
|
|
|
if (my_net_init(net, net->vio))
|
|
{
|
|
vio_delete(net->vio);
|
|
net->vio = 0;
|
|
set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
|
|
goto error;
|
|
}
|
|
vio_keepalive(net->vio,TRUE);
|
|
/* Override local client variables */
|
|
if (mysql->options.read_timeout)
|
|
net->read_timeout= mysql->options.read_timeout;
|
|
if (mysql->options.write_timeout)
|
|
net->write_timeout= mysql->options.write_timeout;
|
|
if (mysql->options.max_allowed_packet)
|
|
net->max_packet_size= mysql->options.max_allowed_packet;
|
|
|
|
/* Get version info */
|
|
mysql->protocol_version= PROTOCOL_VERSION; /* Assume this */
|
|
if (mysql->options.connect_timeout &&
|
|
vio_poll_read(net->vio, mysql->options.connect_timeout))
|
|
{
|
|
set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
|
|
ER(CR_SERVER_LOST_EXTENDED),
|
|
"waiting for initial communication packet",
|
|
errno);
|
|
goto error;
|
|
}
|
|
|
|
/*
|
|
Part 1: Connection established, read and parse first packet
|
|
*/
|
|
|
|
if ((pkt_length=cli_safe_read(mysql)) == packet_error)
|
|
{
|
|
if (mysql->net.last_errno == CR_SERVER_LOST)
|
|
set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
|
|
ER(CR_SERVER_LOST_EXTENDED),
|
|
"reading initial communication packet",
|
|
errno);
|
|
goto error;
|
|
}
|
|
/* Check if version of protocol matches current one */
|
|
|
|
mysql->protocol_version= net->read_pos[0];
|
|
DBUG_DUMP("packet",(char*) net->read_pos,10);
|
|
DBUG_PRINT("info",("mysql protocol version %d, server=%d",
|
|
PROTOCOL_VERSION, mysql->protocol_version));
|
|
if (mysql->protocol_version != PROTOCOL_VERSION)
|
|
{
|
|
strmov(net->sqlstate, unknown_sqlstate);
|
|
net->last_errno= CR_VERSION_ERROR;
|
|
my_snprintf(net->last_error, sizeof(net->last_error)-1,
|
|
ER(CR_VERSION_ERROR), mysql->protocol_version,
|
|
PROTOCOL_VERSION);
|
|
goto error;
|
|
}
|
|
end=strend((char*) net->read_pos+1);
|
|
mysql->thread_id=uint4korr(end+1);
|
|
end+=5;
|
|
/*
|
|
Scramble is split into two parts because old clients does not understand
|
|
long scrambles; here goes the first part.
|
|
*/
|
|
strmake(mysql->scramble, end, SCRAMBLE_LENGTH_323);
|
|
end+= SCRAMBLE_LENGTH_323+1;
|
|
|
|
if (pkt_length >= (uint) (end+1 - (char*) net->read_pos))
|
|
mysql->server_capabilities=uint2korr(end);
|
|
if (pkt_length >= (uint) (end+18 - (char*) net->read_pos))
|
|
{
|
|
/* New protocol with 16 bytes to describe server characteristics */
|
|
mysql->server_language=end[2];
|
|
mysql->server_status=uint2korr(end+3);
|
|
}
|
|
end+= 18;
|
|
if (pkt_length >= (uint) (end + SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323 + 1 -
|
|
(char *) net->read_pos))
|
|
strmake(mysql->scramble+SCRAMBLE_LENGTH_323, end,
|
|
SCRAMBLE_LENGTH-SCRAMBLE_LENGTH_323);
|
|
else
|
|
mysql->server_capabilities&= ~CLIENT_SECURE_CONNECTION;
|
|
|
|
if (mysql->options.secure_auth && passwd[0] &&
|
|
!(mysql->server_capabilities & CLIENT_SECURE_CONNECTION))
|
|
{
|
|
set_mysql_error(mysql, CR_SECURE_AUTH, unknown_sqlstate);
|
|
goto error;
|
|
}
|
|
|
|
if (mysql_init_character_set(mysql))
|
|
goto error;
|
|
|
|
/* Save connection information */
|
|
if (!my_multi_malloc(MYF(0),
|
|
&mysql->host_info, (uint) strlen(host_info)+1,
|
|
&mysql->host, (uint) strlen(host)+1,
|
|
&mysql->unix_socket,unix_socket ?
|
|
(uint) strlen(unix_socket)+1 : (uint) 1,
|
|
&mysql->server_version,
|
|
(uint) (end - (char*) net->read_pos),
|
|
NullS) ||
|
|
!(mysql->user=my_strdup(user,MYF(0))) ||
|
|
!(mysql->passwd=my_strdup(passwd,MYF(0))))
|
|
{
|
|
set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
|
|
goto error;
|
|
}
|
|
strmov(mysql->host_info,host_info);
|
|
strmov(mysql->host,host);
|
|
if (unix_socket)
|
|
strmov(mysql->unix_socket,unix_socket);
|
|
else
|
|
mysql->unix_socket=0;
|
|
strmov(mysql->server_version,(char*) net->read_pos+1);
|
|
mysql->port=port;
|
|
|
|
/*
|
|
Part 2: format and send client info to the server for access check
|
|
*/
|
|
|
|
client_flag|=mysql->options.client_flag;
|
|
client_flag|=CLIENT_CAPABILITIES;
|
|
if (client_flag & CLIENT_MULTI_STATEMENTS)
|
|
client_flag|= CLIENT_MULTI_RESULTS;
|
|
|
|
#ifdef HAVE_OPENSSL
|
|
if (mysql->options.ssl_key || mysql->options.ssl_cert ||
|
|
mysql->options.ssl_ca || mysql->options.ssl_capath ||
|
|
mysql->options.ssl_cipher)
|
|
mysql->options.use_ssl= 1;
|
|
if (mysql->options.use_ssl)
|
|
client_flag|=CLIENT_SSL;
|
|
#endif /* HAVE_OPENSSL */
|
|
if (db)
|
|
client_flag|=CLIENT_CONNECT_WITH_DB;
|
|
|
|
/* Remove options that server doesn't support */
|
|
client_flag= ((client_flag &
|
|
~(CLIENT_COMPRESS | CLIENT_SSL | CLIENT_PROTOCOL_41)) |
|
|
(client_flag & mysql->server_capabilities));
|
|
#ifndef HAVE_COMPRESS
|
|
client_flag&= ~CLIENT_COMPRESS;
|
|
#endif
|
|
|
|
if (client_flag & CLIENT_PROTOCOL_41)
|
|
{
|
|
/* 4.1 server and 4.1 client has a 32 byte option flag */
|
|
int4store(buff,client_flag);
|
|
int4store(buff+4, net->max_packet_size);
|
|
buff[8]= (char) mysql->charset->number;
|
|
bzero(buff+9, 32-9);
|
|
end= buff+32;
|
|
}
|
|
else
|
|
{
|
|
int2store(buff,client_flag);
|
|
int3store(buff+2,net->max_packet_size);
|
|
end= buff+5;
|
|
}
|
|
mysql->client_flag=client_flag;
|
|
|
|
#ifdef HAVE_OPENSSL
|
|
if (client_flag & CLIENT_SSL)
|
|
{
|
|
/* Do the SSL layering. */
|
|
struct st_mysql_options *options= &mysql->options;
|
|
struct st_VioSSLFd *ssl_fd;
|
|
|
|
/*
|
|
Send client_flag, max_packet_size - unencrypted otherwise
|
|
the server does not know we want to do SSL
|
|
*/
|
|
if (my_net_write(net,buff,(uint) (end-buff)) || net_flush(net))
|
|
{
|
|
set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
|
|
ER(CR_SERVER_LOST_EXTENDED),
|
|
"sending connection information to server",
|
|
errno);
|
|
goto error;
|
|
}
|
|
|
|
/* Create the VioSSLConnectorFd - init SSL and load certs */
|
|
if (!(ssl_fd= new_VioSSLConnectorFd(options->ssl_key,
|
|
options->ssl_cert,
|
|
options->ssl_ca,
|
|
options->ssl_capath,
|
|
options->ssl_cipher)))
|
|
{
|
|
set_mysql_error(mysql, CR_SSL_CONNECTION_ERROR, unknown_sqlstate);
|
|
goto error;
|
|
}
|
|
mysql->connector_fd= (void*)ssl_fd;
|
|
|
|
/* Connect to the server */
|
|
DBUG_PRINT("info", ("IO layer change in progress..."));
|
|
if (sslconnect(ssl_fd, mysql->net.vio,
|
|
(long) (mysql->options.connect_timeout)))
|
|
{
|
|
set_mysql_error(mysql, CR_SSL_CONNECTION_ERROR, unknown_sqlstate);
|
|
goto error;
|
|
}
|
|
DBUG_PRINT("info", ("IO layer change done!"));
|
|
|
|
/* Verify server cert */
|
|
if ((client_flag & CLIENT_SSL_VERIFY_SERVER_CERT) &&
|
|
ssl_verify_server_cert(mysql->net.vio, mysql->host))
|
|
{
|
|
set_mysql_error(mysql, CR_SSL_CONNECTION_ERROR, unknown_sqlstate);
|
|
goto error;
|
|
}
|
|
|
|
}
|
|
#endif /* HAVE_OPENSSL */
|
|
|
|
DBUG_PRINT("info",("Server version = '%s' capabilites: %lu status: %u client_flag: %lu",
|
|
mysql->server_version,mysql->server_capabilities,
|
|
mysql->server_status, client_flag));
|
|
/* This needs to be changed as it's not useful with big packets */
|
|
if (user && user[0])
|
|
strmake(end,user,USERNAME_LENGTH); /* Max user name */
|
|
else
|
|
read_user_name((char*) end);
|
|
|
|
/* We have to handle different version of handshake here */
|
|
#ifdef _CUSTOMCONFIG_
|
|
#include "_cust_libmysql.h"
|
|
#endif
|
|
DBUG_PRINT("info",("user: %s",end));
|
|
end= strend(end) + 1;
|
|
if (passwd[0])
|
|
{
|
|
if (mysql->server_capabilities & CLIENT_SECURE_CONNECTION)
|
|
{
|
|
*end++= SCRAMBLE_LENGTH;
|
|
scramble(end, mysql->scramble, passwd);
|
|
end+= SCRAMBLE_LENGTH;
|
|
}
|
|
else
|
|
{
|
|
scramble_323(end, mysql->scramble, passwd);
|
|
end+= SCRAMBLE_LENGTH_323 + 1;
|
|
}
|
|
}
|
|
else
|
|
*end++= '\0'; /* empty password */
|
|
|
|
/* Add database if needed */
|
|
if (db && (mysql->server_capabilities & CLIENT_CONNECT_WITH_DB))
|
|
{
|
|
end= strmake(end, db, NAME_LEN) + 1;
|
|
mysql->db= my_strdup(db,MYF(MY_WME));
|
|
db= 0;
|
|
}
|
|
/* Write authentication package */
|
|
if (my_net_write(net,buff,(ulong) (end-buff)) || net_flush(net))
|
|
{
|
|
set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
|
|
ER(CR_SERVER_LOST_EXTENDED),
|
|
"sending authentication information",
|
|
errno);
|
|
goto error;
|
|
}
|
|
|
|
/*
|
|
Part 3: Authorization data's been sent. Now server can reply with
|
|
OK-packet, or re-request scrambled password.
|
|
*/
|
|
|
|
if ((pkt_length=cli_safe_read(mysql)) == packet_error)
|
|
{
|
|
if (mysql->net.last_errno == CR_SERVER_LOST)
|
|
set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
|
|
ER(CR_SERVER_LOST_EXTENDED),
|
|
"reading authorization packet",
|
|
errno);
|
|
goto error;
|
|
}
|
|
|
|
if (pkt_length == 1 && net->read_pos[0] == 254 &&
|
|
mysql->server_capabilities & CLIENT_SECURE_CONNECTION)
|
|
{
|
|
/*
|
|
By sending this very specific reply server asks us to send scrambled
|
|
password in old format.
|
|
*/
|
|
scramble_323(buff, mysql->scramble, passwd);
|
|
if (my_net_write(net, buff, SCRAMBLE_LENGTH_323 + 1) || net_flush(net))
|
|
{
|
|
set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
|
|
ER(CR_SERVER_LOST_EXTENDED),
|
|
"sending password information",
|
|
errno);
|
|
goto error;
|
|
}
|
|
/* Read what server thinks about out new auth message report */
|
|
if (cli_safe_read(mysql) == packet_error)
|
|
{
|
|
if (mysql->net.last_errno == CR_SERVER_LOST)
|
|
set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
|
|
ER(CR_SERVER_LOST_EXTENDED),
|
|
"reading final connect information",
|
|
errno);
|
|
goto error;
|
|
}
|
|
}
|
|
|
|
if (client_flag & CLIENT_COMPRESS) /* We will use compression */
|
|
net->compress=1;
|
|
|
|
#ifdef CHECK_LICENSE
|
|
if (check_license(mysql))
|
|
goto error;
|
|
#endif
|
|
|
|
if (db && mysql_select_db(mysql, db))
|
|
{
|
|
if (mysql->net.last_errno == CR_SERVER_LOST)
|
|
set_mysql_extended_error(mysql, CR_SERVER_LOST, unknown_sqlstate,
|
|
ER(CR_SERVER_LOST_EXTENDED),
|
|
"Setting intital database",
|
|
errno);
|
|
goto error;
|
|
}
|
|
|
|
if (mysql->options.init_commands)
|
|
{
|
|
DYNAMIC_ARRAY *init_commands= mysql->options.init_commands;
|
|
char **ptr= (char**)init_commands->buffer;
|
|
char **end= ptr + init_commands->elements;
|
|
|
|
my_bool reconnect=mysql->reconnect;
|
|
mysql->reconnect=0;
|
|
|
|
for (; ptr<end; ptr++)
|
|
{
|
|
MYSQL_RES *res;
|
|
if (mysql_real_query(mysql,*ptr, (ulong) strlen(*ptr)))
|
|
goto error;
|
|
if (mysql->fields)
|
|
{
|
|
if (!(res= cli_use_result(mysql)))
|
|
goto error;
|
|
mysql_free_result(res);
|
|
}
|
|
}
|
|
mysql->reconnect=reconnect;
|
|
}
|
|
|
|
#ifndef TO_BE_DELETED
|
|
if (mysql->options.rpl_probe && mysql_rpl_probe(mysql))
|
|
goto error;
|
|
#endif
|
|
|
|
DBUG_PRINT("exit", ("Mysql handler: 0x%lx", (long) mysql));
|
|
reset_sigpipe(mysql);
|
|
DBUG_RETURN(mysql);
|
|
|
|
error:
|
|
reset_sigpipe(mysql);
|
|
DBUG_PRINT("error",("message: %u/%s (%s)",
|
|
net->last_errno, net->sqlstate, net->last_error));
|
|
{
|
|
/* Free alloced memory */
|
|
end_server(mysql);
|
|
mysql_close_free(mysql);
|
|
if (!(((ulong) client_flag) & CLIENT_REMEMBER_OPTIONS))
|
|
mysql_close_free_options(mysql);
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/* needed when we move MYSQL structure to a different address */
|
|
|
|
#ifndef TO_BE_DELETED
|
|
static void mysql_fix_pointers(MYSQL* mysql, MYSQL* old_mysql)
|
|
{
|
|
MYSQL *tmp, *tmp_prev;
|
|
if (mysql->master == old_mysql)
|
|
mysql->master= mysql;
|
|
if (mysql->last_used_con == old_mysql)
|
|
mysql->last_used_con= mysql;
|
|
if (mysql->last_used_slave == old_mysql)
|
|
mysql->last_used_slave= mysql;
|
|
for (tmp_prev = mysql, tmp = mysql->next_slave;
|
|
tmp != old_mysql;tmp = tmp->next_slave)
|
|
{
|
|
tmp_prev= tmp;
|
|
}
|
|
tmp_prev->next_slave= mysql;
|
|
}
|
|
#endif
|
|
|
|
|
|
my_bool mysql_reconnect(MYSQL *mysql)
|
|
{
|
|
MYSQL tmp_mysql;
|
|
DBUG_ENTER("mysql_reconnect");
|
|
DBUG_ASSERT(mysql);
|
|
DBUG_PRINT("enter", ("mysql->reconnect: %d", mysql->reconnect));
|
|
|
|
if (!mysql->reconnect ||
|
|
(mysql->server_status & SERVER_STATUS_IN_TRANS) || !mysql->host_info)
|
|
{
|
|
/* Allow reconnect next time */
|
|
mysql->server_status&= ~SERVER_STATUS_IN_TRANS;
|
|
set_mysql_error(mysql, CR_SERVER_GONE_ERROR, unknown_sqlstate);
|
|
DBUG_RETURN(1);
|
|
}
|
|
mysql_init(&tmp_mysql);
|
|
tmp_mysql.options= mysql->options;
|
|
tmp_mysql.rpl_pivot= mysql->rpl_pivot;
|
|
|
|
if (!mysql_real_connect(&tmp_mysql,mysql->host,mysql->user,mysql->passwd,
|
|
mysql->db, mysql->port, mysql->unix_socket,
|
|
mysql->client_flag | CLIENT_REMEMBER_OPTIONS))
|
|
{
|
|
mysql->net.last_errno= tmp_mysql.net.last_errno;
|
|
strmov(mysql->net.last_error, tmp_mysql.net.last_error);
|
|
strmov(mysql->net.sqlstate, tmp_mysql.net.sqlstate);
|
|
DBUG_RETURN(1);
|
|
}
|
|
if (mysql_set_character_set(&tmp_mysql, mysql->charset->csname))
|
|
{
|
|
DBUG_PRINT("error", ("mysql_set_character_set() failed"));
|
|
bzero((char*) &tmp_mysql.options,sizeof(tmp_mysql.options));
|
|
mysql_close(&tmp_mysql);
|
|
mysql->net.last_errno= tmp_mysql.net.last_errno;
|
|
strmov(mysql->net.last_error, tmp_mysql.net.last_error);
|
|
strmov(mysql->net.sqlstate, tmp_mysql.net.sqlstate);
|
|
DBUG_RETURN(1);
|
|
}
|
|
|
|
DBUG_PRINT("info", ("reconnect succeded"));
|
|
tmp_mysql.reconnect= 1;
|
|
tmp_mysql.free_me= mysql->free_me;
|
|
|
|
/*
|
|
For each stmt in mysql->stmts, move it to tmp_mysql if it is
|
|
in state MYSQL_STMT_INIT_DONE, otherwise close it.
|
|
*/
|
|
{
|
|
LIST *element= mysql->stmts;
|
|
for (; element; element= element->next)
|
|
{
|
|
MYSQL_STMT *stmt= (MYSQL_STMT *) element->data;
|
|
if (stmt->state != MYSQL_STMT_INIT_DONE)
|
|
{
|
|
stmt->mysql= 0;
|
|
}
|
|
else
|
|
{
|
|
tmp_mysql.stmts= list_add(tmp_mysql.stmts, &stmt->list);
|
|
}
|
|
/* No need to call list_delete for statement here */
|
|
}
|
|
mysql->stmts= NULL;
|
|
}
|
|
|
|
/* Don't free options as these are now used in tmp_mysql */
|
|
bzero((char*) &mysql->options,sizeof(mysql->options));
|
|
mysql->free_me=0;
|
|
mysql_close(mysql);
|
|
*mysql=tmp_mysql;
|
|
mysql_fix_pointers(mysql, &tmp_mysql); /* adjust connection pointers */
|
|
net_clear(&mysql->net, 1);
|
|
mysql->affected_rows= ~(my_ulonglong) 0;
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/**************************************************************************
|
|
Set current database
|
|
**************************************************************************/
|
|
|
|
int STDCALL
|
|
mysql_select_db(MYSQL *mysql, const char *db)
|
|
{
|
|
int error;
|
|
DBUG_ENTER("mysql_select_db");
|
|
DBUG_PRINT("enter",("db: '%s'",db));
|
|
|
|
if ((error=simple_command(mysql,COM_INIT_DB,db,(ulong) strlen(db),0)))
|
|
DBUG_RETURN(error);
|
|
my_free(mysql->db,MYF(MY_ALLOW_ZERO_PTR));
|
|
mysql->db=my_strdup(db,MYF(MY_WME));
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
Send a QUIT to the server and close the connection
|
|
If handle is alloced by mysql connect free it.
|
|
*************************************************************************/
|
|
|
|
static void mysql_close_free_options(MYSQL *mysql)
|
|
{
|
|
DBUG_ENTER("mysql_close_free_options");
|
|
|
|
my_free(mysql->options.user,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.host,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.password,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.unix_socket,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.db,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.my_cnf_file,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.my_cnf_group,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.charset_dir,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.charset_name,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.client_ip,MYF(MY_ALLOW_ZERO_PTR));
|
|
if (mysql->options.init_commands)
|
|
{
|
|
DYNAMIC_ARRAY *init_commands= mysql->options.init_commands;
|
|
char **ptr= (char**)init_commands->buffer;
|
|
char **end= ptr + init_commands->elements;
|
|
for (; ptr<end; ptr++)
|
|
my_free(*ptr,MYF(MY_WME));
|
|
delete_dynamic(init_commands);
|
|
my_free((char*)init_commands,MYF(MY_WME));
|
|
}
|
|
#ifdef HAVE_OPENSSL
|
|
mysql_ssl_free(mysql);
|
|
#endif /* HAVE_OPENSSL */
|
|
#ifdef HAVE_SMEM
|
|
if (mysql->options.shared_memory_base_name != def_shared_memory_base_name)
|
|
my_free(mysql->options.shared_memory_base_name,MYF(MY_ALLOW_ZERO_PTR));
|
|
#endif /* HAVE_SMEM */
|
|
bzero((char*) &mysql->options,sizeof(mysql->options));
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
static void mysql_close_free(MYSQL *mysql)
|
|
{
|
|
my_free((gptr) mysql->host_info,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->user,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->passwd,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->db,MYF(MY_ALLOW_ZERO_PTR));
|
|
#if defined(EMBEDDED_LIBRARY) || MYSQL_VERSION_ID >= 50100
|
|
my_free(mysql->info_buffer,MYF(MY_ALLOW_ZERO_PTR));
|
|
mysql->info_buffer= 0;
|
|
#endif
|
|
/* Clear pointers for better safety */
|
|
mysql->host_info= mysql->user= mysql->passwd= mysql->db= 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Clear connection pointer of every statement: this is necessary
|
|
to give error on attempt to use a prepared statement of closed
|
|
connection.
|
|
|
|
SYNOPSYS
|
|
mysql_detach_stmt_list()
|
|
stmt_list pointer to mysql->stmts
|
|
|
|
NOTE
|
|
There is similar code in mysql_reconnect(), so changes here
|
|
should also be reflected there.
|
|
*/
|
|
|
|
void mysql_detach_stmt_list(LIST **stmt_list __attribute__((unused)))
|
|
{
|
|
#ifdef MYSQL_CLIENT
|
|
/* Reset connection handle in all prepared statements. */
|
|
LIST *element= *stmt_list;
|
|
for (; element; element= element->next)
|
|
{
|
|
MYSQL_STMT *stmt= (MYSQL_STMT *) element->data;
|
|
stmt->mysql= 0;
|
|
/* No need to call list_delete for statement here */
|
|
}
|
|
*stmt_list= 0;
|
|
#endif /* MYSQL_CLIENT */
|
|
}
|
|
|
|
|
|
void STDCALL mysql_close(MYSQL *mysql)
|
|
{
|
|
DBUG_ENTER("mysql_close");
|
|
if (mysql) /* Some simple safety */
|
|
{
|
|
/* If connection is still up, send a QUIT message */
|
|
if (mysql->net.vio != 0)
|
|
{
|
|
free_old_query(mysql);
|
|
mysql->status=MYSQL_STATUS_READY; /* Force command */
|
|
mysql->reconnect=0;
|
|
simple_command(mysql,COM_QUIT,NullS,0,1);
|
|
end_server(mysql); /* Sets mysql->net.vio= 0 */
|
|
}
|
|
mysql_close_free_options(mysql);
|
|
mysql_close_free(mysql);
|
|
mysql_detach_stmt_list(&mysql->stmts);
|
|
#ifndef TO_BE_DELETED
|
|
/* free/close slave list */
|
|
if (mysql->rpl_pivot)
|
|
{
|
|
MYSQL* tmp;
|
|
for (tmp = mysql->next_slave; tmp != mysql; )
|
|
{
|
|
/* trick to avoid following freed pointer */
|
|
MYSQL* tmp1 = tmp->next_slave;
|
|
mysql_close(tmp);
|
|
tmp = tmp1;
|
|
}
|
|
mysql->rpl_pivot=0;
|
|
}
|
|
#endif
|
|
if (mysql != mysql->master)
|
|
mysql_close(mysql->master);
|
|
#ifndef MYSQL_SERVER
|
|
if (mysql->thd)
|
|
(*mysql->methods->free_embedded_thd)(mysql);
|
|
#endif
|
|
if (mysql->free_me)
|
|
my_free((gptr) mysql,MYF(0));
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
static my_bool cli_read_query_result(MYSQL *mysql)
|
|
{
|
|
uchar *pos;
|
|
ulong field_count;
|
|
MYSQL_DATA *fields;
|
|
ulong length;
|
|
DBUG_ENTER("cli_read_query_result");
|
|
|
|
/*
|
|
Read from the connection which we actually used, which
|
|
could differ from the original connection if we have slaves
|
|
*/
|
|
mysql = mysql->last_used_con;
|
|
|
|
if ((length = cli_safe_read(mysql)) == packet_error)
|
|
DBUG_RETURN(1);
|
|
free_old_query(mysql); /* Free old result */
|
|
#ifdef MYSQL_CLIENT /* Avoid warn of unused labels*/
|
|
get_info:
|
|
#endif
|
|
pos=(uchar*) mysql->net.read_pos;
|
|
if ((field_count= net_field_length(&pos)) == 0)
|
|
{
|
|
mysql->affected_rows= net_field_length_ll(&pos);
|
|
mysql->insert_id= net_field_length_ll(&pos);
|
|
DBUG_PRINT("info",("affected_rows: %lu insert_id: %lu",
|
|
(ulong) mysql->affected_rows,
|
|
(ulong) mysql->insert_id));
|
|
if (protocol_41(mysql))
|
|
{
|
|
mysql->server_status=uint2korr(pos); pos+=2;
|
|
mysql->warning_count=uint2korr(pos); pos+=2;
|
|
}
|
|
else if (mysql->server_capabilities & CLIENT_TRANSACTIONS)
|
|
{
|
|
/* MySQL 4.0 protocol */
|
|
mysql->server_status=uint2korr(pos); pos+=2;
|
|
mysql->warning_count= 0;
|
|
}
|
|
DBUG_PRINT("info",("status: %u warning_count: %u",
|
|
mysql->server_status, mysql->warning_count));
|
|
if (pos < mysql->net.read_pos+length && net_field_length(&pos))
|
|
mysql->info=(char*) pos;
|
|
DBUG_RETURN(0);
|
|
}
|
|
#ifdef MYSQL_CLIENT
|
|
if (field_count == NULL_LENGTH) /* LOAD DATA LOCAL INFILE */
|
|
{
|
|
int error=handle_local_infile(mysql,(char*) pos);
|
|
if ((length= cli_safe_read(mysql)) == packet_error || error)
|
|
DBUG_RETURN(1);
|
|
goto get_info; /* Get info packet */
|
|
}
|
|
#endif
|
|
if (!(mysql->server_status & SERVER_STATUS_AUTOCOMMIT))
|
|
mysql->server_status|= SERVER_STATUS_IN_TRANS;
|
|
|
|
if (!(fields=cli_read_rows(mysql,(MYSQL_FIELD*)0, protocol_41(mysql) ? 7:5)))
|
|
DBUG_RETURN(1);
|
|
if (!(mysql->fields=unpack_fields(fields,&mysql->field_alloc,
|
|
(uint) field_count,0,
|
|
mysql->server_capabilities)))
|
|
DBUG_RETURN(1);
|
|
mysql->status= MYSQL_STATUS_GET_RESULT;
|
|
mysql->field_count= (uint) field_count;
|
|
DBUG_PRINT("exit",("ok"));
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/*
|
|
Send the query and return so we can do something else.
|
|
Needs to be followed by mysql_read_query_result() when we want to
|
|
finish processing it.
|
|
*/
|
|
|
|
int STDCALL
|
|
mysql_send_query(MYSQL* mysql, const char* query, ulong length)
|
|
{
|
|
DBUG_ENTER("mysql_send_query");
|
|
DBUG_PRINT("enter",("rpl_parse: %d rpl_pivot: %d",
|
|
mysql->options.rpl_parse, mysql->rpl_pivot));
|
|
#ifndef TO_BE_DELETED
|
|
if (mysql->options.rpl_parse && mysql->rpl_pivot)
|
|
{
|
|
switch (mysql_rpl_query_type(query, length)) {
|
|
case MYSQL_RPL_MASTER:
|
|
DBUG_RETURN(mysql_master_send_query(mysql, query, length));
|
|
case MYSQL_RPL_SLAVE:
|
|
DBUG_RETURN(mysql_slave_send_query(mysql, query, length));
|
|
case MYSQL_RPL_ADMIN:
|
|
break; /* fall through */
|
|
}
|
|
}
|
|
mysql->last_used_con = mysql;
|
|
#endif
|
|
|
|
DBUG_RETURN(simple_command(mysql, COM_QUERY, query, length, 1));
|
|
}
|
|
|
|
|
|
int STDCALL
|
|
mysql_real_query(MYSQL *mysql, const char *query, ulong length)
|
|
{
|
|
DBUG_ENTER("mysql_real_query");
|
|
DBUG_PRINT("enter",("handle: 0x%lx", (long) mysql));
|
|
DBUG_PRINT("query",("Query = '%-.4096s'",query));
|
|
|
|
if (mysql_send_query(mysql,query,length))
|
|
DBUG_RETURN(1);
|
|
DBUG_RETURN((int) (*mysql->methods->read_query_result)(mysql));
|
|
}
|
|
|
|
|
|
/**************************************************************************
|
|
Alloc result struct for buffered results. All rows are read to buffer.
|
|
mysql_data_seek may be used.
|
|
**************************************************************************/
|
|
|
|
MYSQL_RES * STDCALL mysql_store_result(MYSQL *mysql)
|
|
{
|
|
MYSQL_RES *result;
|
|
DBUG_ENTER("mysql_store_result");
|
|
/* read from the actually used connection */
|
|
mysql = mysql->last_used_con;
|
|
if (!mysql->fields)
|
|
DBUG_RETURN(0);
|
|
if (mysql->status != MYSQL_STATUS_GET_RESULT)
|
|
{
|
|
set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
|
|
DBUG_RETURN(0);
|
|
}
|
|
mysql->status=MYSQL_STATUS_READY; /* server is ready */
|
|
if (!(result=(MYSQL_RES*) my_malloc((uint) (sizeof(MYSQL_RES)+
|
|
sizeof(ulong) *
|
|
mysql->field_count),
|
|
MYF(MY_WME | MY_ZEROFILL))))
|
|
{
|
|
set_mysql_error(mysql, CR_OUT_OF_MEMORY, unknown_sqlstate);
|
|
DBUG_RETURN(0);
|
|
}
|
|
result->methods= mysql->methods;
|
|
result->eof=1; /* Marker for buffered */
|
|
result->lengths=(ulong*) (result+1);
|
|
if (!(result->data=
|
|
(*mysql->methods->read_rows)(mysql,mysql->fields,mysql->field_count)))
|
|
{
|
|
my_free((gptr) result,MYF(0));
|
|
DBUG_RETURN(0);
|
|
}
|
|
mysql->affected_rows= result->row_count= result->data->rows;
|
|
result->data_cursor= result->data->data;
|
|
result->fields= mysql->fields;
|
|
result->field_alloc= mysql->field_alloc;
|
|
result->field_count= mysql->field_count;
|
|
/* The rest of result members is bzeroed in malloc */
|
|
mysql->fields=0; /* fields is now in result */
|
|
/* just in case this was mistakenly called after mysql_stmt_execute() */
|
|
mysql->unbuffered_fetch_owner= 0;
|
|
DBUG_RETURN(result); /* Data fetched */
|
|
}
|
|
|
|
|
|
/**************************************************************************
|
|
Alloc struct for use with unbuffered reads. Data is fetched by domand
|
|
when calling to mysql_fetch_row.
|
|
mysql_data_seek is a noop.
|
|
|
|
No other queries may be specified with the same MYSQL handle.
|
|
There shouldn't be much processing per row because mysql server shouldn't
|
|
have to wait for the client (and will not wait more than 30 sec/packet).
|
|
**************************************************************************/
|
|
|
|
static MYSQL_RES * cli_use_result(MYSQL *mysql)
|
|
{
|
|
MYSQL_RES *result;
|
|
DBUG_ENTER("cli_use_result");
|
|
|
|
mysql = mysql->last_used_con;
|
|
|
|
if (!mysql->fields)
|
|
DBUG_RETURN(0);
|
|
if (mysql->status != MYSQL_STATUS_GET_RESULT)
|
|
{
|
|
set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
|
|
DBUG_RETURN(0);
|
|
}
|
|
if (!(result=(MYSQL_RES*) my_malloc(sizeof(*result)+
|
|
sizeof(ulong)*mysql->field_count,
|
|
MYF(MY_WME | MY_ZEROFILL))))
|
|
DBUG_RETURN(0);
|
|
result->lengths=(ulong*) (result+1);
|
|
result->methods= mysql->methods;
|
|
if (!(result->row=(MYSQL_ROW)
|
|
my_malloc(sizeof(result->row[0])*(mysql->field_count+1), MYF(MY_WME))))
|
|
{ /* Ptrs: to one row */
|
|
my_free((gptr) result,MYF(0));
|
|
DBUG_RETURN(0);
|
|
}
|
|
result->fields= mysql->fields;
|
|
result->field_alloc= mysql->field_alloc;
|
|
result->field_count= mysql->field_count;
|
|
result->current_field=0;
|
|
result->handle= mysql;
|
|
result->current_row= 0;
|
|
mysql->fields=0; /* fields is now in result */
|
|
mysql->status=MYSQL_STATUS_USE_RESULT;
|
|
mysql->unbuffered_fetch_owner= &result->unbuffered_fetch_cancelled;
|
|
DBUG_RETURN(result); /* Data is read to be fetched */
|
|
}
|
|
|
|
|
|
/**************************************************************************
|
|
Return next row of the query results
|
|
**************************************************************************/
|
|
|
|
MYSQL_ROW STDCALL
|
|
mysql_fetch_row(MYSQL_RES *res)
|
|
{
|
|
DBUG_ENTER("mysql_fetch_row");
|
|
if (!res->data)
|
|
{ /* Unbufferred fetch */
|
|
if (!res->eof)
|
|
{
|
|
MYSQL *mysql= res->handle;
|
|
if (mysql->status != MYSQL_STATUS_USE_RESULT)
|
|
{
|
|
set_mysql_error(mysql,
|
|
res->unbuffered_fetch_cancelled ?
|
|
CR_FETCH_CANCELED : CR_COMMANDS_OUT_OF_SYNC,
|
|
unknown_sqlstate);
|
|
}
|
|
else if (!(read_one_row(mysql, res->field_count, res->row, res->lengths)))
|
|
{
|
|
res->row_count++;
|
|
DBUG_RETURN(res->current_row=res->row);
|
|
}
|
|
DBUG_PRINT("info",("end of data"));
|
|
res->eof=1;
|
|
mysql->status=MYSQL_STATUS_READY;
|
|
/*
|
|
Reset only if owner points to us: there is a chance that somebody
|
|
started new query after mysql_stmt_close():
|
|
*/
|
|
if (mysql->unbuffered_fetch_owner == &res->unbuffered_fetch_cancelled)
|
|
mysql->unbuffered_fetch_owner= 0;
|
|
/* Don't clear handle in mysql_free_result */
|
|
res->handle=0;
|
|
}
|
|
DBUG_RETURN((MYSQL_ROW) NULL);
|
|
}
|
|
{
|
|
MYSQL_ROW tmp;
|
|
if (!res->data_cursor)
|
|
{
|
|
DBUG_PRINT("info",("end of data"));
|
|
DBUG_RETURN(res->current_row=(MYSQL_ROW) NULL);
|
|
}
|
|
tmp = res->data_cursor->data;
|
|
res->data_cursor = res->data_cursor->next;
|
|
DBUG_RETURN(res->current_row=tmp);
|
|
}
|
|
}
|
|
|
|
|
|
/**************************************************************************
|
|
Get column lengths of the current row
|
|
If one uses mysql_use_result, res->lengths contains the length information,
|
|
else the lengths are calculated from the offset between pointers.
|
|
**************************************************************************/
|
|
|
|
ulong * STDCALL
|
|
mysql_fetch_lengths(MYSQL_RES *res)
|
|
{
|
|
MYSQL_ROW column;
|
|
|
|
if (!(column=res->current_row))
|
|
return 0; /* Something is wrong */
|
|
if (res->data)
|
|
(*res->methods->fetch_lengths)(res->lengths, column, res->field_count);
|
|
return res->lengths;
|
|
}
|
|
|
|
|
|
int STDCALL
|
|
mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg)
|
|
{
|
|
DBUG_ENTER("mysql_option");
|
|
DBUG_PRINT("enter",("option: %d",(int) option));
|
|
switch (option) {
|
|
case MYSQL_OPT_CONNECT_TIMEOUT:
|
|
mysql->options.connect_timeout= *(uint*) arg;
|
|
break;
|
|
case MYSQL_OPT_READ_TIMEOUT:
|
|
mysql->options.read_timeout= *(uint*) arg;
|
|
break;
|
|
case MYSQL_OPT_WRITE_TIMEOUT:
|
|
mysql->options.write_timeout= *(uint*) arg;
|
|
break;
|
|
case MYSQL_OPT_COMPRESS:
|
|
mysql->options.compress= 1; /* Remember for connect */
|
|
mysql->options.client_flag|= CLIENT_COMPRESS;
|
|
break;
|
|
case MYSQL_OPT_NAMED_PIPE: /* This option is depricated */
|
|
mysql->options.protocol=MYSQL_PROTOCOL_PIPE; /* Force named pipe */
|
|
break;
|
|
case MYSQL_OPT_LOCAL_INFILE: /* Allow LOAD DATA LOCAL ?*/
|
|
if (!arg || test(*(uint*) arg))
|
|
mysql->options.client_flag|= CLIENT_LOCAL_FILES;
|
|
else
|
|
mysql->options.client_flag&= ~CLIENT_LOCAL_FILES;
|
|
break;
|
|
case MYSQL_INIT_COMMAND:
|
|
add_init_command(&mysql->options,arg);
|
|
break;
|
|
case MYSQL_READ_DEFAULT_FILE:
|
|
my_free(mysql->options.my_cnf_file,MYF(MY_ALLOW_ZERO_PTR));
|
|
mysql->options.my_cnf_file=my_strdup(arg,MYF(MY_WME));
|
|
break;
|
|
case MYSQL_READ_DEFAULT_GROUP:
|
|
my_free(mysql->options.my_cnf_group,MYF(MY_ALLOW_ZERO_PTR));
|
|
mysql->options.my_cnf_group=my_strdup(arg,MYF(MY_WME));
|
|
break;
|
|
case MYSQL_SET_CHARSET_DIR:
|
|
my_free(mysql->options.charset_dir,MYF(MY_ALLOW_ZERO_PTR));
|
|
mysql->options.charset_dir=my_strdup(arg,MYF(MY_WME));
|
|
break;
|
|
case MYSQL_SET_CHARSET_NAME:
|
|
my_free(mysql->options.charset_name,MYF(MY_ALLOW_ZERO_PTR));
|
|
mysql->options.charset_name=my_strdup(arg,MYF(MY_WME));
|
|
break;
|
|
case MYSQL_OPT_PROTOCOL:
|
|
mysql->options.protocol= *(uint*) arg;
|
|
break;
|
|
case MYSQL_SHARED_MEMORY_BASE_NAME:
|
|
#ifdef HAVE_SMEM
|
|
if (mysql->options.shared_memory_base_name != def_shared_memory_base_name)
|
|
my_free(mysql->options.shared_memory_base_name,MYF(MY_ALLOW_ZERO_PTR));
|
|
mysql->options.shared_memory_base_name=my_strdup(arg,MYF(MY_WME));
|
|
#endif
|
|
break;
|
|
case MYSQL_OPT_USE_REMOTE_CONNECTION:
|
|
case MYSQL_OPT_USE_EMBEDDED_CONNECTION:
|
|
case MYSQL_OPT_GUESS_CONNECTION:
|
|
mysql->options.methods_to_use= option;
|
|
break;
|
|
case MYSQL_SET_CLIENT_IP:
|
|
mysql->options.client_ip= my_strdup(arg, MYF(MY_WME));
|
|
break;
|
|
case MYSQL_SECURE_AUTH:
|
|
mysql->options.secure_auth= *(my_bool *) arg;
|
|
break;
|
|
case MYSQL_REPORT_DATA_TRUNCATION:
|
|
mysql->options.report_data_truncation= test(*(my_bool *) arg);
|
|
break;
|
|
case MYSQL_OPT_RECONNECT:
|
|
mysql->reconnect= *(my_bool *) arg;
|
|
break;
|
|
case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
|
|
if (!arg || test(*(uint*) arg))
|
|
mysql->options.client_flag|= CLIENT_SSL_VERIFY_SERVER_CERT;
|
|
else
|
|
mysql->options.client_flag&= ~CLIENT_SSL_VERIFY_SERVER_CERT;
|
|
break;
|
|
default:
|
|
DBUG_RETURN(1);
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/****************************************************************************
|
|
Functions to get information from the MySQL structure
|
|
These are functions to make shared libraries more usable.
|
|
****************************************************************************/
|
|
|
|
/* MYSQL_RES */
|
|
my_ulonglong STDCALL mysql_num_rows(MYSQL_RES *res)
|
|
{
|
|
return res->row_count;
|
|
}
|
|
|
|
unsigned int STDCALL mysql_num_fields(MYSQL_RES *res)
|
|
{
|
|
return res->field_count;
|
|
}
|
|
|
|
uint STDCALL mysql_errno(MYSQL *mysql)
|
|
{
|
|
return mysql->net.last_errno;
|
|
}
|
|
|
|
|
|
const char * STDCALL mysql_error(MYSQL *mysql)
|
|
{
|
|
return mysql->net.last_error;
|
|
}
|
|
|
|
|
|
/*
|
|
Get version number for server in a form easy to test on
|
|
|
|
SYNOPSIS
|
|
mysql_get_server_version()
|
|
mysql Connection
|
|
|
|
EXAMPLE
|
|
4.1.0-alfa -> 40100
|
|
|
|
NOTES
|
|
We will ensure that a newer server always has a bigger number.
|
|
|
|
RETURN
|
|
Signed number > 323000
|
|
*/
|
|
|
|
ulong STDCALL
|
|
mysql_get_server_version(MYSQL *mysql)
|
|
{
|
|
uint major, minor, version;
|
|
char *pos= mysql->server_version, *end_pos;
|
|
major= (uint) strtoul(pos, &end_pos, 10); pos=end_pos+1;
|
|
minor= (uint) strtoul(pos, &end_pos, 10); pos=end_pos+1;
|
|
version= (uint) strtoul(pos, &end_pos, 10);
|
|
return (ulong) major*10000L+(ulong) (minor*100+version);
|
|
}
|
|
|
|
|
|
/*
|
|
mysql_set_character_set function sends SET NAMES cs_name to
|
|
the server (which changes character_set_client, character_set_result
|
|
and character_set_connection) and updates mysql->charset so other
|
|
functions like mysql_real_escape will work correctly.
|
|
*/
|
|
int STDCALL mysql_set_character_set(MYSQL *mysql, const char *cs_name)
|
|
{
|
|
struct charset_info_st *cs;
|
|
const char *save_csdir= charsets_dir;
|
|
|
|
if (mysql->options.charset_dir)
|
|
charsets_dir= mysql->options.charset_dir;
|
|
|
|
if (strlen(cs_name) < MY_CS_NAME_SIZE &&
|
|
(cs= get_charset_by_csname(cs_name, MY_CS_PRIMARY, MYF(0))))
|
|
{
|
|
char buff[MY_CS_NAME_SIZE + 10];
|
|
charsets_dir= save_csdir;
|
|
/* Skip execution of "SET NAMES" for pre-4.1 servers */
|
|
if (mysql_get_server_version(mysql) < 40100)
|
|
return 0;
|
|
sprintf(buff, "SET NAMES %s", cs_name);
|
|
if (!mysql_real_query(mysql, buff, strlen(buff)))
|
|
{
|
|
mysql->charset= cs;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
char cs_dir_name[FN_REFLEN];
|
|
get_charsets_dir(cs_dir_name);
|
|
mysql->net.last_errno= CR_CANT_READ_CHARSET;
|
|
strmov(mysql->net.sqlstate, unknown_sqlstate);
|
|
my_snprintf(mysql->net.last_error, sizeof(mysql->net.last_error) - 1,
|
|
ER(mysql->net.last_errno), cs_name, cs_dir_name);
|
|
|
|
}
|
|
charsets_dir= save_csdir;
|
|
return mysql->net.last_errno;
|
|
}
|
|
|
|
|