Merge lp:~sergei.glushchenko/percona-server/5.5-ps-bug1313696 into lp:percona-server/5.5

Proposed by Sergei Glushchenko on 2014-04-29
Status: Merged
Approved by: Alexey Kopytov on 2014-05-15
Approved revision: 648
Merged at revision: 660
Proposed branch: lp:~sergei.glushchenko/percona-server/5.5-ps-bug1313696
Merge into: lp:percona-server/5.5
Diff against target: 20593 lines (+8156/-202) (has conflicts)
1128 files modified
CMakeLists.txt (+12/-0)
Makefile-ps.OTHER (+58/-0)
UDF/configure.ac (+6/-0)
VERSION (+5/-0)
build-ps/build-binary.sh (+36/-0)
build-ps/debian/control (+106/-9)
build-ps/debian/rules (+174/-0)
doc/source/conf.py (+4/-0)
doc/source/installation/apt_repo.rst (+4/-0)
doc/source/release-notes/release-notes_index.rst (+7/-0)
doc/source/upstream-bug-fixes.rst (+112/-0)
extra/yassl/src/handshake.cpp (+4/-0)
extra/yassl/src/yassl_imp.cpp (+4/-0)
libmysql/CMakeLists.txt (+8/-0)
man/comp_err.1 (+9/-0)
man/innochecksum.1 (+9/-0)
man/msql2mysql.1 (+9/-0)
man/my_print_defaults.1 (+9/-0)
man/myisam_ftdump.1 (+9/-0)
man/myisamchk.1 (+9/-0)
man/myisamlog.1 (+9/-0)
man/myisampack.1 (+9/-0)
man/mysql-stress-test.pl.1 (+9/-0)
man/mysql-test-run.pl.1 (+9/-0)
man/mysql.1 (+9/-0)
man/mysql.server.1 (+9/-0)
man/mysql_client_test.1 (+9/-0)
man/mysql_config.1 (+9/-0)
man/mysql_convert_table_format.1 (+9/-0)
man/mysql_find_rows.1 (+9/-0)
man/mysql_fix_extensions.1 (+9/-0)
man/mysql_install_db.1 (+9/-0)
man/mysql_plugin.1 (+9/-0)
man/mysql_secure_installation.1 (+9/-0)
man/mysql_setpermission.1 (+9/-0)
man/mysql_tzinfo_to_sql.1 (+9/-0)
man/mysql_upgrade.1 (+9/-0)
man/mysql_waitpid.1 (+9/-0)
man/mysql_zap.1 (+9/-0)
man/mysqlaccess.1 (+9/-0)
man/mysqladmin.1 (+9/-0)
man/mysqlbinlog.1 (+9/-0)
man/mysqlbug.1 (+9/-0)
man/mysqlcheck.1 (+9/-0)
man/mysqld.8 (+9/-0)
man/mysqld_multi.1 (+9/-0)
man/mysqld_safe.1 (+9/-0)
man/mysqldump.1 (+9/-0)
man/mysqldumpslow.1 (+9/-0)
man/mysqlhotcopy.1 (+9/-0)
man/mysqlimport.1 (+9/-0)
man/mysqlshow.1 (+9/-0)
man/mysqlslap.1 (+9/-0)
man/mysqltest.1 (+9/-0)
man/ndb-common-options.1 (+9/-0)
man/ndb_blob_tool.1 (+9/-0)
man/ndb_config.1 (+13/-0)
man/ndb_cpcd.1 (+9/-0)
man/ndb_delete_all.1 (+9/-0)
man/ndb_desc.1 (+9/-0)
man/ndb_drop_index.1 (+13/-0)
man/ndb_drop_table.1 (+9/-0)
man/ndb_error_reporter.1 (+9/-0)
man/ndb_index_stat.1 (+9/-0)
man/ndb_mgm.1 (+9/-0)
man/ndb_mgmd.8 (+9/-0)
man/ndb_print_backup_file.1 (+9/-0)
man/ndb_print_schema_file.1 (+9/-0)
man/ndb_print_sys_file.1 (+9/-0)
man/ndb_restore.1 (+9/-0)
man/ndb_select_all.1 (+9/-0)
man/ndb_select_count.1 (+9/-0)
man/ndb_show_tables.1 (+9/-0)
man/ndb_size.pl.1 (+9/-0)
man/ndb_waiter.1 (+9/-0)
man/ndbd.8 (+9/-0)
man/ndbd_redo_log_reader.1 (+41/-0)
man/ndbinfo_select_all.1 (+9/-0)
man/ndbmtd.8 (+9/-0)
man/perror.1 (+9/-0)
man/replace.1 (+9/-0)
man/resolve_stack_dump.1 (+9/-0)
man/resolveip.1 (+9/-0)
mysql-test/include/audit_log_events.inc (+110/-53)
mysql-test/r/audit_log.result (+289/-140)
mysys/my_libwrap.c (+4/-0)
packaging/rpm-oel/CMakeLists.txt (+39/-0)
packaging/rpm-oel/mysql-embedded-check.c (+26/-0)
packaging/rpm-oel/mysql.spec.in (+1559/-0)
plugin/audit_log/audit_log.c (+749/-0)
scripts/CMakeLists.txt (+4/-0)
scripts/comp_sql.c (+4/-0)
scripts/mysql_config.pl.in (+6/-0)
scripts/mysql_config.sh (+9/-0)
scripts/mysql_install_db.pl.in (+16/-0)
scripts/mysql_install_db.sh (+9/-0)
sql/filesort.cc (+5/-0)
sql/log_event.cc (+5/-0)
sql/log_event.h (+5/-0)
sql/mysqld.cc (+4/-0)
sql/share/charsets/Index.xml (+4/-0)
sql/share/charsets/ascii.xml (+4/-0)
sql/share/charsets/cp1250.xml (+4/-0)
sql/share/charsets/hebrew.xml (+4/-0)
sql/share/charsets/latin1.xml (+4/-0)
sql/share/charsets/latin2.xml (+4/-0)
sql/share/charsets/latin5.xml (+4/-0)
storage/innobase/include/univ.i (+4/-0)
storage/myisam/ftbench/Ecompare.pl (+4/-0)
storage/myisam/ftbench/Ecreate.pl (+4/-0)
storage/myisam/ftbench/Ereport.pl (+4/-0)
storage/ndb/config/win-includes (+4/-0)
storage/ndb/config/win-libraries (+4/-0)
storage/ndb/config/win-name (+4/-0)
storage/ndb/config/win-sources (+4/-0)
storage/ndb/include/debugger/DebuggerNames.hpp (+4/-0)
storage/ndb/include/debugger/EventLogger.hpp (+4/-0)
storage/ndb/include/debugger/GrepError.hpp (+4/-0)
storage/ndb/include/debugger/SignalLoggerManager.hpp (+4/-0)
storage/ndb/include/editline/editline.h (+4/-0)
storage/ndb/include/kernel/AttributeDescriptor.hpp (+4/-0)
storage/ndb/include/kernel/AttributeHeader.hpp (+4/-0)
storage/ndb/include/kernel/AttributeList.hpp (+4/-0)
storage/ndb/include/kernel/BlockNumbers.h (+4/-0)
storage/ndb/include/kernel/GlobalSignalNumbers.h (+4/-0)
storage/ndb/include/kernel/GrepEvent.hpp (+4/-0)
storage/ndb/include/kernel/Interpreter.hpp (+4/-0)
storage/ndb/include/kernel/LogLevel.hpp (+4/-0)
storage/ndb/include/kernel/NodeBitmask.hpp (+4/-0)
storage/ndb/include/kernel/NodeInfo.hpp (+4/-0)
storage/ndb/include/kernel/NodeState.hpp (+4/-0)
storage/ndb/include/kernel/RefConvert.hpp (+4/-0)
storage/ndb/include/kernel/kernel_types.h (+4/-0)
storage/ndb/include/kernel/ndb_limits.h (+4/-0)
storage/ndb/include/kernel/signaldata/AbortAll.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/AccFrag.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/AccScan.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/AllocNodeId.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/AlterIndx.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/AlterTable.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/AlterTrig.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/ApiVersion.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/AttrInfo.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/BackupImpl.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/BuildIndx.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CmInit.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/ConfigParamId.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CopyActive.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CopyFrag.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CreateEvnt.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CreateFrag.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CreateIndx.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CreateTab.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CreateTable.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/CreateTrig.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DiAddTab.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DiGetNodes.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DictLock.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DictObjOp.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DictStart.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DihAddFrag.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DihContinueB.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DihStartTab.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DisconnectRep.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DropFilegroup.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DropIndx.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DropObj.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DropTab.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DropTabFile.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DropTable.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DropTrig.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/EmptyLcp.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/EndTo.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/EventReport.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/ExecFragReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/Extent.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/FailRep.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/FsAppendReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/FsCloseReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/FsConf.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/FsRef.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/GCPSave.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/GetTabInfo.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/GetTableId.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/GrepImpl.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/HotSpareRep.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/KeyInfo.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/LCP.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/ListTables.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/LqhFrag.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/LqhKey.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/LqhTransConf.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/ManagementServer.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/MasterGCP.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/MasterLCP.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/NdbSttor.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/NextScan.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/NodeFailRep.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/PackedSignal.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/PrepDropTab.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/RelTabMem.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/RepImpl.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/RestoreImpl.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/ResumeReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/RouteOrd.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/ScanFrag.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/ScanTab.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/SetVarReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/SignalData.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/SrFragidConf.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/StartFragReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/StartInfo.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/StartMe.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/StartOrd.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/StartPerm.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/StartRec.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/StartTo.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/StopMe.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/StopPerm.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/StopReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/SumaImpl.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/SystemError.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TamperOrd.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TcCommit.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TcContinueB.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TcHbRep.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TcIndx.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TcKeyConf.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TcKeyRef.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TcKeyReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TestOrd.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TransIdAI.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TupCommit.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TupFrag.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TupKey.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TuxBound.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TuxContinueB.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TuxMaint.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/UpdateTo.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/UtilDelete.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/UtilExecute.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/UtilLock.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/UtilPrepare.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/UtilRelease.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/UtilSequence.hpp (+4/-0)
storage/ndb/include/kernel/signaldata/WaitGCP.hpp (+4/-0)
storage/ndb/include/kernel/trigger_definitions.h (+4/-0)
storage/ndb/include/logger/ConsoleLogHandler.hpp (+4/-0)
storage/ndb/include/logger/FileLogHandler.hpp (+4/-0)
storage/ndb/include/logger/LogHandler.hpp (+4/-0)
storage/ndb/include/logger/Logger.hpp (+4/-0)
storage/ndb/include/logger/SysLogHandler.hpp (+4/-0)
storage/ndb/include/mgmapi/mgmapi.h (+4/-0)
storage/ndb/include/mgmapi/mgmapi_debug.h (+4/-0)
storage/ndb/include/mgmapi/mgmapi_error.h (+4/-0)
storage/ndb/include/mgmapi/ndb_logevent.h (+4/-0)
storage/ndb/include/mgmapi/ndbd_exit_codes.h (+4/-0)
storage/ndb/include/mgmcommon/ConfigRetriever.hpp (+4/-0)
storage/ndb/include/mgmcommon/IPCConfig.hpp (+4/-0)
storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp (+4/-0)
storage/ndb/include/ndb_constants.h (+4/-0)
storage/ndb/include/ndb_global.h.in (+4/-0)
storage/ndb/include/ndb_init.h (+4/-0)
storage/ndb/include/ndb_types.h.in (+4/-0)
storage/ndb/include/ndb_version.h.in (+4/-0)
storage/ndb/include/ndbapi/Ndb.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbApi.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbBlob.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbDictionary.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbError.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbEventOperation.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbIndexOperation.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbIndexStat.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbOperation.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbPool.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbRecAttr.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbReceiver.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbScanFilter.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbScanOperation.hpp (+4/-0)
storage/ndb/include/ndbapi/NdbTransaction.hpp (+4/-0)
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp (+4/-0)
storage/ndb/include/ndbapi/ndb_opt_defaults.h (+4/-0)
storage/ndb/include/ndbapi/ndbapi_limits.h (+4/-0)
storage/ndb/include/ndbapi/ndberror.h (+4/-0)
storage/ndb/include/newtonapi/dba.h (+4/-0)
storage/ndb/include/newtonapi/defs/pcn_types.h (+4/-0)
storage/ndb/include/portlib/NdbCondition.h (+4/-0)
storage/ndb/include/portlib/NdbConfig.h (+4/-0)
storage/ndb/include/portlib/NdbDaemon.h (+4/-0)
storage/ndb/include/portlib/NdbEnv.h (+4/-0)
storage/ndb/include/portlib/NdbHost.h (+4/-0)
storage/ndb/include/portlib/NdbMain.h (+4/-0)
storage/ndb/include/portlib/NdbMem.h (+4/-0)
storage/ndb/include/portlib/NdbMutex.h (+4/-0)
storage/ndb/include/portlib/NdbSleep.h (+4/-0)
storage/ndb/include/portlib/NdbTCP.h (+4/-0)
storage/ndb/include/portlib/NdbThread.h (+4/-0)
storage/ndb/include/portlib/NdbTick.h (+4/-0)
storage/ndb/include/portlib/PortDefs.h (+4/-0)
storage/ndb/include/portlib/prefetch.h (+4/-0)
storage/ndb/include/transporter/TransporterCallback.hpp (+4/-0)
storage/ndb/include/transporter/TransporterDefinitions.hpp (+4/-0)
storage/ndb/include/transporter/TransporterRegistry.hpp (+4/-0)
storage/ndb/include/util/BaseString.hpp (+4/-0)
storage/ndb/include/util/Bitmask.hpp (+4/-0)
storage/ndb/include/util/File.hpp (+4/-0)
storage/ndb/include/util/InputStream.hpp (+4/-0)
storage/ndb/include/util/NdbOut.hpp (+4/-0)
storage/ndb/include/util/NdbSqlUtil.hpp (+4/-0)
storage/ndb/include/util/OutputStream.hpp (+4/-0)
storage/ndb/include/util/Parser.hpp (+4/-0)
storage/ndb/include/util/Properties.hpp (+4/-0)
storage/ndb/include/util/SimpleProperties.hpp (+4/-0)
storage/ndb/include/util/SocketAuthenticator.hpp (+4/-0)
storage/ndb/include/util/SocketClient.hpp (+4/-0)
storage/ndb/include/util/SocketServer.hpp (+4/-0)
storage/ndb/include/util/UtilBuffer.hpp (+4/-0)
storage/ndb/include/util/Vector.hpp (+4/-0)
storage/ndb/include/util/basestring_vsnprintf.h (+4/-0)
storage/ndb/include/util/md5_hash.hpp (+4/-0)
storage/ndb/include/util/ndb_rand.h (+4/-0)
storage/ndb/include/util/random.h (+4/-0)
storage/ndb/include/util/socket_io.h (+4/-0)
storage/ndb/include/util/uucode.h (+4/-0)
storage/ndb/include/util/version.h (+4/-0)
storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp (+4/-0)
storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp (+4/-0)
storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp (+4/-0)
storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp (+4/-0)
storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp (+4/-0)
storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp (+4/-0)
storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp (+4/-0)
storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp (+4/-0)
storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp (+4/-0)
storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp (+4/-0)
storage/ndb/src/common/debugger/BlockNames.cpp (+4/-0)
storage/ndb/src/common/debugger/DebuggerNames.cpp (+4/-0)
storage/ndb/src/common/debugger/EventLogger.cpp (+4/-0)
storage/ndb/src/common/debugger/GrepError.cpp (+4/-0)
storage/ndb/src/common/debugger/SignalLoggerManager.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/AccLock.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/AlterTab.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/AlterTable.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/ContinueB.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/DropIndx.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/DropTab.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/DropTrig.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/FailRep.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/FsConf.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/FsRef.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/GCPSave.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/LCP.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/LqhKey.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/ScanTab.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/StartRec.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/SystemError.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/TcIndx.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/TupCommit.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/TupKey.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/UtilLock.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp (+4/-0)
storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp (+4/-0)
storage/ndb/src/common/logger/ConsoleLogHandler.cpp (+4/-0)
storage/ndb/src/common/logger/FileLogHandler.cpp (+4/-0)
storage/ndb/src/common/logger/LogHandler.cpp (+4/-0)
storage/ndb/src/common/logger/LogHandlerList.cpp (+4/-0)
storage/ndb/src/common/logger/LogHandlerList.hpp (+4/-0)
storage/ndb/src/common/logger/Logger.cpp (+4/-0)
storage/ndb/src/common/logger/SysLogHandler.cpp (+4/-0)
storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp (+4/-0)
storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp (+4/-0)
storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp (+4/-0)
storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp (+4/-0)
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp (+4/-0)
storage/ndb/src/common/mgmcommon/IPCConfig.cpp (+4/-0)
storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp (+4/-0)
storage/ndb/src/common/portlib/NdbCondition.c (+4/-0)
storage/ndb/src/common/portlib/NdbConfig.c (+4/-0)
storage/ndb/src/common/portlib/NdbDaemon.c (+4/-0)
storage/ndb/src/common/portlib/NdbEnv.c (+4/-0)
storage/ndb/src/common/portlib/NdbHost.c (+4/-0)
storage/ndb/src/common/portlib/NdbMem.c (+4/-0)
storage/ndb/src/common/portlib/NdbPortLibTest.cpp (+4/-0)
storage/ndb/src/common/portlib/NdbSleep.c (+4/-0)
storage/ndb/src/common/portlib/NdbTCP.cpp (+4/-0)
storage/ndb/src/common/portlib/NdbThread.c (+4/-0)
storage/ndb/src/common/portlib/NdbTick.c (+4/-0)
storage/ndb/src/common/portlib/memtest.c (+4/-0)
storage/ndb/src/common/portlib/mmstest.cpp (+4/-0)
storage/ndb/src/common/portlib/munmaptest.cpp (+4/-0)
storage/ndb/src/common/portlib/win32/NdbCondition.c (+4/-0)
storage/ndb/src/common/portlib/win32/NdbDaemon.c (+4/-0)
storage/ndb/src/common/portlib/win32/NdbEnv.c (+4/-0)
storage/ndb/src/common/portlib/win32/NdbHost.c (+4/-0)
storage/ndb/src/common/portlib/win32/NdbMem.c (+4/-0)
storage/ndb/src/common/portlib/win32/NdbMutex.c (+4/-0)
storage/ndb/src/common/portlib/win32/NdbSleep.c (+4/-0)
storage/ndb/src/common/portlib/win32/NdbTCP.c (+4/-0)
storage/ndb/src/common/portlib/win32/NdbThread.c (+4/-0)
storage/ndb/src/common/portlib/win32/NdbTick.c (+4/-0)
storage/ndb/src/common/transporter/Packer.cpp (+4/-0)
storage/ndb/src/common/transporter/Packer.hpp (+4/-0)
storage/ndb/src/common/transporter/SCI_Transporter.cpp (+4/-0)
storage/ndb/src/common/transporter/SCI_Transporter.hpp (+4/-0)
storage/ndb/src/common/transporter/SHM_Buffer.hpp (+4/-0)
storage/ndb/src/common/transporter/SHM_Transporter.cpp (+4/-0)
storage/ndb/src/common/transporter/SHM_Transporter.hpp (+4/-0)
storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp (+4/-0)
storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp (+4/-0)
storage/ndb/src/common/transporter/SendBuffer.cpp (+4/-0)
storage/ndb/src/common/transporter/SendBuffer.hpp (+4/-0)
storage/ndb/src/common/transporter/TCP_Transporter.cpp (+4/-0)
storage/ndb/src/common/transporter/TCP_Transporter.hpp (+4/-0)
storage/ndb/src/common/transporter/Transporter.cpp (+4/-0)
storage/ndb/src/common/transporter/Transporter.hpp (+4/-0)
storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp (+4/-0)
storage/ndb/src/common/transporter/TransporterRegistry.cpp (+4/-0)
storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp (+4/-0)
storage/ndb/src/common/transporter/buddy.cpp (+4/-0)
storage/ndb/src/common/transporter/buddy.hpp (+4/-0)
storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp (+4/-0)
storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp (+4/-0)
storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp (+4/-0)
storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp (+4/-0)
storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp (+4/-0)
storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp (+4/-0)
storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp (+4/-0)
storage/ndb/src/common/util/BaseString.cpp (+4/-0)
storage/ndb/src/common/util/File.cpp (+4/-0)
storage/ndb/src/common/util/InputStream.cpp (+4/-0)
storage/ndb/src/common/util/NdbOut.cpp (+4/-0)
storage/ndb/src/common/util/NdbSqlUtil.cpp (+4/-0)
storage/ndb/src/common/util/OutputStream.cpp (+4/-0)
storage/ndb/src/common/util/Parser.cpp (+4/-0)
storage/ndb/src/common/util/Properties.cpp (+4/-0)
storage/ndb/src/common/util/SimpleProperties.cpp (+4/-0)
storage/ndb/src/common/util/SocketAuthenticator.cpp (+4/-0)
storage/ndb/src/common/util/SocketClient.cpp (+4/-0)
storage/ndb/src/common/util/SocketServer.cpp (+4/-0)
storage/ndb/src/common/util/basestring_vsnprintf.c (+4/-0)
storage/ndb/src/common/util/filetest/FileUnitTest.cpp (+4/-0)
storage/ndb/src/common/util/filetest/FileUnitTest.hpp (+4/-0)
storage/ndb/src/common/util/md5_hash.cpp (+4/-0)
storage/ndb/src/common/util/ndb_init.c (+4/-0)
storage/ndb/src/common/util/ndb_rand.c (+4/-0)
storage/ndb/src/common/util/random.c (+4/-0)
storage/ndb/src/common/util/socket_io.cpp (+4/-0)
storage/ndb/src/common/util/strdup.c (+4/-0)
storage/ndb/src/common/util/testProperties/testProperties.cpp (+4/-0)
storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp (+4/-0)
storage/ndb/src/common/util/uucode.c (+4/-0)
storage/ndb/src/common/util/version.c (+4/-0)
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp (+4/-0)
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h (+4/-0)
storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp (+4/-0)
storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp (+4/-0)
storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h (+4/-0)
storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp (+4/-0)
storage/ndb/src/cw/cpcc-win32/C++/TreeView.h (+4/-0)
storage/ndb/src/cw/cpcc-win32/C++/resource.h (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/Database.cs (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/Process.cs (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs (+4/-0)
storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs (+4/-0)
storage/ndb/src/cw/cpcd/APIService.cpp (+4/-0)
storage/ndb/src/cw/cpcd/APIService.hpp (+4/-0)
storage/ndb/src/cw/cpcd/CPCD.cpp (+4/-0)
storage/ndb/src/cw/cpcd/CPCD.hpp (+4/-0)
storage/ndb/src/cw/cpcd/Monitor.cpp (+4/-0)
storage/ndb/src/cw/cpcd/Process.cpp (+4/-0)
storage/ndb/src/cw/cpcd/common.cpp (+4/-0)
storage/ndb/src/cw/cpcd/common.hpp (+4/-0)
storage/ndb/src/cw/test/socketclient/socketClientTest.cpp (+4/-0)
storage/ndb/src/cw/util/ClientInterface.cpp (+4/-0)
storage/ndb/src/cw/util/ClientInterface.hpp (+4/-0)
storage/ndb/src/cw/util/SocketRegistry.cpp (+4/-0)
storage/ndb/src/cw/util/SocketRegistry.hpp (+4/-0)
storage/ndb/src/cw/util/SocketService.cpp (+4/-0)
storage/ndb/src/cw/util/SocketService.hpp (+4/-0)
storage/ndb/src/kernel/SimBlockList.cpp (+4/-0)
storage/ndb/src/kernel/blocks/backup/Backup.cpp (+4/-0)
storage/ndb/src/kernel/blocks/backup/Backup.hpp (+4/-0)
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp (+4/-0)
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp (+4/-0)
storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp (+4/-0)
storage/ndb/src/kernel/blocks/backup/read.cpp (+4/-0)
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp (+4/-0)
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp (+4/-0)
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp (+4/-0)
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp (+4/-0)
storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp (+4/-0)
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp (+4/-0)
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp (+4/-0)
storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp (+4/-0)
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp (+4/-0)
storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp (+4/-0)
storage/ndb/src/kernel/blocks/diskpage.hpp (+4/-0)
storage/ndb/src/kernel/blocks/lgman.hpp (+4/-0)
storage/ndb/src/kernel/blocks/mutexes.hpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp (+4/-0)
storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp (+4/-0)
storage/ndb/src/kernel/blocks/pgman.cpp (+4/-0)
storage/ndb/src/kernel/blocks/pgman.hpp (+4/-0)
storage/ndb/src/kernel/blocks/print_file.cpp (+4/-0)
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp (+4/-0)
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp (+4/-0)
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp (+4/-0)
storage/ndb/src/kernel/blocks/qmgr/timer.hpp (+4/-0)
storage/ndb/src/kernel/blocks/record_types.hpp (+4/-0)
storage/ndb/src/kernel/blocks/restore.cpp (+4/-0)
storage/ndb/src/kernel/blocks/restore.hpp (+4/-0)
storage/ndb/src/kernel/blocks/suma/Suma.cpp (+4/-0)
storage/ndb/src/kernel/blocks/suma/Suma.hpp (+4/-0)
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp (+4/-0)
storage/ndb/src/kernel/blocks/trix/Trix.cpp (+4/-0)
storage/ndb/src/kernel/blocks/trix/Trix.hpp (+4/-0)
storage/ndb/src/kernel/blocks/tsman.cpp (+4/-0)
storage/ndb/src/kernel/blocks/tsman.hpp (+4/-0)
storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp (+4/-0)
storage/ndb/src/kernel/error/ErrorReporter.cpp (+4/-0)
storage/ndb/src/kernel/error/ErrorReporter.hpp (+4/-0)
storage/ndb/src/kernel/error/TimeModule.cpp (+4/-0)
storage/ndb/src/kernel/error/TimeModule.hpp (+4/-0)
storage/ndb/src/kernel/error/ndbd_exit_codes.c (+4/-0)
storage/ndb/src/kernel/main.cpp (+4/-0)
storage/ndb/src/kernel/vm/Array.hpp (+4/-0)
storage/ndb/src/kernel/vm/ArrayPool.hpp (+4/-0)
storage/ndb/src/kernel/vm/CArray.hpp (+4/-0)
storage/ndb/src/kernel/vm/Callback.hpp (+4/-0)
storage/ndb/src/kernel/vm/ClusterConfiguration.cpp (+4/-0)
storage/ndb/src/kernel/vm/ClusterConfiguration.hpp (+4/-0)
storage/ndb/src/kernel/vm/Configuration.hpp (+4/-0)
storage/ndb/src/kernel/vm/DLCFifoList.hpp (+4/-0)
storage/ndb/src/kernel/vm/DLCHashTable.hpp (+4/-0)
storage/ndb/src/kernel/vm/DLFifoList.hpp (+4/-0)
storage/ndb/src/kernel/vm/DLHashTable.hpp (+4/-0)
storage/ndb/src/kernel/vm/DLHashTable2.hpp (+4/-0)
storage/ndb/src/kernel/vm/DLList.hpp (+4/-0)
storage/ndb/src/kernel/vm/DataBuffer.hpp (+4/-0)
storage/ndb/src/kernel/vm/DynArr256.cpp (+4/-0)
storage/ndb/src/kernel/vm/DynArr256.hpp (+4/-0)
storage/ndb/src/kernel/vm/Emulator.cpp (+4/-0)
storage/ndb/src/kernel/vm/Emulator.hpp (+4/-0)
storage/ndb/src/kernel/vm/FastScheduler.cpp (+4/-0)
storage/ndb/src/kernel/vm/FastScheduler.hpp (+4/-0)
storage/ndb/src/kernel/vm/GlobalData.hpp (+4/-0)
storage/ndb/src/kernel/vm/KeyDescriptor.hpp (+4/-0)
storage/ndb/src/kernel/vm/KeyTable.hpp (+4/-0)
storage/ndb/src/kernel/vm/KeyTable2.hpp (+4/-0)
storage/ndb/src/kernel/vm/KeyTable2Ref.hpp (+4/-0)
storage/ndb/src/kernel/vm/LinearPool.hpp (+4/-0)
storage/ndb/src/kernel/vm/LongSignal.hpp (+4/-0)
storage/ndb/src/kernel/vm/Mutex.cpp (+4/-0)
storage/ndb/src/kernel/vm/Mutex.hpp (+4/-0)
storage/ndb/src/kernel/vm/NdbdSuperPool.cpp (+4/-0)
storage/ndb/src/kernel/vm/NdbdSuperPool.hpp (+4/-0)
storage/ndb/src/kernel/vm/Pool.cpp (+4/-0)
storage/ndb/src/kernel/vm/Pool.hpp (+4/-0)
storage/ndb/src/kernel/vm/Prio.hpp (+4/-0)
storage/ndb/src/kernel/vm/RWPool.cpp (+4/-0)
storage/ndb/src/kernel/vm/RWPool.hpp (+4/-0)
storage/ndb/src/kernel/vm/RequestTracker.hpp (+4/-0)
storage/ndb/src/kernel/vm/Rope.hpp (+4/-0)
storage/ndb/src/kernel/vm/SLFifoList.hpp (+4/-0)
storage/ndb/src/kernel/vm/SLList.hpp (+4/-0)
storage/ndb/src/kernel/vm/SafeCounter.cpp (+4/-0)
storage/ndb/src/kernel/vm/SafeCounter.hpp (+4/-0)
storage/ndb/src/kernel/vm/SectionReader.cpp (+4/-0)
storage/ndb/src/kernel/vm/SectionReader.hpp (+4/-0)
storage/ndb/src/kernel/vm/SignalCounter.hpp (+4/-0)
storage/ndb/src/kernel/vm/SimBlockList.hpp (+4/-0)
storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp (+4/-0)
storage/ndb/src/kernel/vm/SimulatedBlock.cpp (+4/-0)
storage/ndb/src/kernel/vm/SimulatedBlock.hpp (+4/-0)
storage/ndb/src/kernel/vm/SuperPool.cpp (+4/-0)
storage/ndb/src/kernel/vm/SuperPool.hpp (+4/-0)
storage/ndb/src/kernel/vm/ThreadConfig.cpp (+4/-0)
storage/ndb/src/kernel/vm/ThreadConfig.hpp (+4/-0)
storage/ndb/src/kernel/vm/TimeQueue.cpp (+4/-0)
storage/ndb/src/kernel/vm/TimeQueue.hpp (+4/-0)
storage/ndb/src/kernel/vm/TransporterCallback.cpp (+4/-0)
storage/ndb/src/kernel/vm/VMSignal.cpp (+4/-0)
storage/ndb/src/kernel/vm/VMSignal.hpp (+4/-0)
storage/ndb/src/kernel/vm/WOPool.cpp (+4/-0)
storage/ndb/src/kernel/vm/WOPool.hpp (+4/-0)
storage/ndb/src/kernel/vm/WaitQueue.hpp (+4/-0)
storage/ndb/src/kernel/vm/WatchDog.cpp (+4/-0)
storage/ndb/src/kernel/vm/WatchDog.hpp (+4/-0)
storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp (+4/-0)
storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp (+4/-0)
storage/ndb/src/kernel/vm/al_test/main.cpp (+4/-0)
storage/ndb/src/kernel/vm/bench_pool.cpp (+4/-0)
storage/ndb/src/kernel/vm/ndbd_malloc.cpp (+4/-0)
storage/ndb/src/kernel/vm/ndbd_malloc.hpp (+4/-0)
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp (+4/-0)
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp (+4/-0)
storage/ndb/src/kernel/vm/pc.hpp (+4/-0)
storage/ndb/src/kernel/vm/testCopy/rr.cpp (+4/-0)
storage/ndb/src/kernel/vm/testCopy/testCopy.cpp (+4/-0)
storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp (+4/-0)
storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp (+4/-0)
storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp (+4/-0)
storage/ndb/src/kernel/vm/testSuperPool.cpp (+4/-0)
storage/ndb/src/mgmapi/LocalConfig.cpp (+4/-0)
storage/ndb/src/mgmapi/LocalConfig.hpp (+4/-0)
storage/ndb/src/mgmapi/mgmapi_configuration.hpp (+4/-0)
storage/ndb/src/mgmapi/mgmapi_internal.h (+4/-0)
storage/ndb/src/mgmapi/ndb_logevent.hpp (+4/-0)
storage/ndb/src/mgmapi/test/keso.c (+4/-0)
storage/ndb/src/mgmapi/test/mgmSrvApi.cpp (+4/-0)
storage/ndb/src/mgmclient/CommandInterpreter.cpp (+4/-0)
storage/ndb/src/mgmclient/ndb_mgmclient.h (+4/-0)
storage/ndb/src/mgmclient/ndb_mgmclient.hpp (+4/-0)
storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp (+4/-0)
storage/ndb/src/mgmsrv/Config.cpp (+4/-0)
storage/ndb/src/mgmsrv/Config.hpp (+4/-0)
storage/ndb/src/mgmsrv/ConfigInfo.cpp (+4/-0)
storage/ndb/src/mgmsrv/ConfigInfo.hpp (+4/-0)
storage/ndb/src/mgmsrv/InitConfigFileParser.hpp (+4/-0)
storage/ndb/src/mgmsrv/MgmtSrvr.cpp (+4/-0)
storage/ndb/src/mgmsrv/MgmtSrvr.hpp (+4/-0)
storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp (+4/-0)
storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp (+4/-0)
storage/ndb/src/mgmsrv/Services.cpp (+4/-0)
storage/ndb/src/mgmsrv/Services.hpp (+4/-0)
storage/ndb/src/mgmsrv/SignalQueue.cpp (+4/-0)
storage/ndb/src/mgmsrv/SignalQueue.hpp (+4/-0)
storage/ndb/src/mgmsrv/convertStrToInt.cpp (+4/-0)
storage/ndb/src/mgmsrv/convertStrToInt.hpp (+4/-0)
storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp (+4/-0)
storage/ndb/src/ndbapi/API.hpp (+4/-0)
storage/ndb/src/ndbapi/ClusterMgr.cpp (+4/-0)
storage/ndb/src/ndbapi/ClusterMgr.hpp (+4/-0)
storage/ndb/src/ndbapi/DictCache.hpp (+4/-0)
storage/ndb/src/ndbapi/Ndb.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbApiSignal.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbApiSignal.hpp (+4/-0)
storage/ndb/src/ndbapi/NdbBlob.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbBlobImpl.hpp (+4/-0)
storage/ndb/src/ndbapi/NdbDictionary.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp (+4/-0)
storage/ndb/src/ndbapi/NdbErrorOut.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbEventOperation.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp (+4/-0)
storage/ndb/src/ndbapi/NdbImpl.hpp (+4/-0)
storage/ndb/src/ndbapi/NdbIndexOperation.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbIndexStat.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbLinHash.hpp (+4/-0)
storage/ndb/src/ndbapi/NdbOperation.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbOperationDefine.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbOperationExec.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbOperationInt.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbOperationScan.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbOperationSearch.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbPool.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbPoolImpl.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbPoolImpl.hpp (+4/-0)
storage/ndb/src/ndbapi/NdbRecAttr.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbReceiver.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbScanFilter.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbScanOperation.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbTransaction.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbTransactionScan.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbUtil.cpp (+4/-0)
storage/ndb/src/ndbapi/NdbUtil.hpp (+4/-0)
storage/ndb/src/ndbapi/NdbWaiter.hpp (+4/-0)
storage/ndb/src/ndbapi/Ndberr.cpp (+4/-0)
storage/ndb/src/ndbapi/Ndbif.cpp (+4/-0)
storage/ndb/src/ndbapi/Ndbinit.cpp (+4/-0)
storage/ndb/src/ndbapi/Ndblist.cpp (+4/-0)
storage/ndb/src/ndbapi/ObjectMap.cpp (+4/-0)
storage/ndb/src/ndbapi/ObjectMap.hpp (+4/-0)
storage/ndb/src/ndbapi/SignalSender.cpp (+4/-0)
storage/ndb/src/ndbapi/SignalSender.hpp (+4/-0)
storage/ndb/src/ndbapi/TransporterFacade.cpp (+4/-0)
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp (+4/-0)
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp (+4/-0)
storage/ndb/src/ndbapi/ndberror.c (+4/-0)
storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp (+4/-0)
storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp (+4/-0)
storage/ndb/test/include/AtrtClient.hpp (+4/-0)
storage/ndb/test/include/CpcClient.hpp (+4/-0)
storage/ndb/test/include/DbUtil.hpp (+4/-0)
storage/ndb/test/include/HugoAsynchTransactions.hpp (+4/-0)
storage/ndb/test/include/HugoCalculator.hpp (+4/-0)
storage/ndb/test/include/HugoOperations.hpp (+4/-0)
storage/ndb/test/include/HugoTransactions.hpp (+4/-0)
storage/ndb/test/include/NDBT.hpp (+4/-0)
storage/ndb/test/include/NDBT_DataSet.hpp (+4/-0)
storage/ndb/test/include/NDBT_DataSetTransaction.hpp (+4/-0)
storage/ndb/test/include/NDBT_Error.hpp (+4/-0)
storage/ndb/test/include/NDBT_Output.hpp (+4/-0)
storage/ndb/test/include/NDBT_ResultRow.hpp (+4/-0)
storage/ndb/test/include/NDBT_ReturnCodes.h (+4/-0)
storage/ndb/test/include/NDBT_Stats.hpp (+4/-0)
storage/ndb/test/include/NDBT_Table.hpp (+4/-0)
storage/ndb/test/include/NDBT_Tables.hpp (+4/-0)
storage/ndb/test/include/NDBT_Test.hpp (+4/-0)
storage/ndb/test/include/NDBT_Thread.hpp (+4/-0)
storage/ndb/test/include/NdbBackup.hpp (+4/-0)
storage/ndb/test/include/NdbConfig.hpp (+4/-0)
storage/ndb/test/include/NdbGrep.hpp (+4/-0)
storage/ndb/test/include/NdbMixRestarter.hpp (+4/-0)
storage/ndb/test/include/NdbRestarter.hpp (+4/-0)
storage/ndb/test/include/NdbRestarts.hpp (+4/-0)
storage/ndb/test/include/NdbSchemaCon.hpp (+4/-0)
storage/ndb/test/include/NdbSchemaOp.hpp (+4/-0)
storage/ndb/test/include/NdbTest.hpp (+4/-0)
storage/ndb/test/include/NdbTimer.hpp (+4/-0)
storage/ndb/test/include/TestNdbEventOperation.hpp (+4/-0)
storage/ndb/test/include/UtilTransactions.hpp (+4/-0)
storage/ndb/test/include/getarg.h (+4/-0)
storage/ndb/test/ndbapi/InsertRecs.cpp (+4/-0)
storage/ndb/test/ndbapi/ScanFilter.hpp (+4/-0)
storage/ndb/test/ndbapi/ScanFunctions.hpp (+4/-0)
storage/ndb/test/ndbapi/ScanInterpretTest.hpp (+4/-0)
storage/ndb/test/ndbapi/TraceNdbApi.cpp (+4/-0)
storage/ndb/test/ndbapi/VerifyNdbApi.cpp (+4/-0)
storage/ndb/test/ndbapi/acid.cpp (+4/-0)
storage/ndb/test/ndbapi/acid2.cpp (+4/-0)
storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp (+4/-0)
storage/ndb/test/ndbapi/adoInsertRecs.cpp (+4/-0)
storage/ndb/test/ndbapi/asyncGenerator.cpp (+4/-0)
storage/ndb/test/ndbapi/bank/Bank.cpp (+4/-0)
storage/ndb/test/ndbapi/bank/Bank.hpp (+4/-0)
storage/ndb/test/ndbapi/bank/BankLoad.cpp (+4/-0)
storage/ndb/test/ndbapi/bank/bankCreator.cpp (+4/-0)
storage/ndb/test/ndbapi/bank/bankMakeGL.cpp (+4/-0)
storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp (+4/-0)
storage/ndb/test/ndbapi/bank/bankTimer.cpp (+4/-0)
storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp (+4/-0)
storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp (+4/-0)
storage/ndb/test/ndbapi/bank/testBank.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/asyncGenerator.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/dbGenerator.h (+4/-0)
storage/ndb/test/ndbapi/bench/dbPopulate.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/dbPopulate.h (+4/-0)
storage/ndb/test/ndbapi/bench/macros.h (+4/-0)
storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/mainPopulate.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/ndb_async1.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/ndb_async2.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/ndb_error.hpp (+4/-0)
storage/ndb/test/ndbapi/bench/ndb_schema.hpp (+4/-0)
storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/testData.h (+4/-0)
storage/ndb/test/ndbapi/bench/testDefinitions.h (+4/-0)
storage/ndb/test/ndbapi/bench/userInterface.cpp (+4/-0)
storage/ndb/test/ndbapi/bench/userInterface.h (+4/-0)
storage/ndb/test/ndbapi/benchronja.cpp (+4/-0)
storage/ndb/test/ndbapi/bulk_copy.cpp (+4/-0)
storage/ndb/test/ndbapi/cdrserver.cpp (+4/-0)
storage/ndb/test/ndbapi/celloDb.cpp (+4/-0)
storage/ndb/test/ndbapi/create_all_tabs.cpp (+4/-0)
storage/ndb/test/ndbapi/create_tab.cpp (+4/-0)
storage/ndb/test/ndbapi/drop_all_tabs.cpp (+4/-0)
storage/ndb/test/ndbapi/flexAsynch.cpp (+4/-0)
storage/ndb/test/ndbapi/flexBench.cpp (+4/-0)
storage/ndb/test/ndbapi/flexHammer.cpp (+4/-0)
storage/ndb/test/ndbapi/flexScan.cpp (+4/-0)
storage/ndb/test/ndbapi/flexTT.cpp (+4/-0)
storage/ndb/test/ndbapi/flexTimedAsynch.cpp (+4/-0)
storage/ndb/test/ndbapi/flex_bench_mysql.cpp (+4/-0)
storage/ndb/test/ndbapi/index.cpp (+4/-0)
storage/ndb/test/ndbapi/index2.cpp (+4/-0)
storage/ndb/test/ndbapi/initronja.cpp (+4/-0)
storage/ndb/test/ndbapi/interpreterInTup.cpp (+4/-0)
storage/ndb/test/ndbapi/mainAsyncGenerator.cpp (+4/-0)
storage/ndb/test/ndbapi/msa.cpp (+4/-0)
storage/ndb/test/ndbapi/ndb_async1.cpp (+4/-0)
storage/ndb/test/ndbapi/ndb_async2.cpp (+4/-0)
storage/ndb/test/ndbapi/ndb_user_populate.cpp (+4/-0)
storage/ndb/test/ndbapi/ndb_user_transaction.cpp (+4/-0)
storage/ndb/test/ndbapi/ndb_user_transaction2.cpp (+4/-0)
storage/ndb/test/ndbapi/ndb_user_transaction3.cpp (+4/-0)
storage/ndb/test/ndbapi/ndb_user_transaction4.cpp (+4/-0)
storage/ndb/test/ndbapi/ndb_user_transaction5.cpp (+4/-0)
storage/ndb/test/ndbapi/ndb_user_transaction6.cpp (+4/-0)
storage/ndb/test/ndbapi/restarter.cpp (+4/-0)
storage/ndb/test/ndbapi/restarter2.cpp (+4/-0)
storage/ndb/test/ndbapi/restarts.cpp (+4/-0)
storage/ndb/test/ndbapi/size.cpp (+4/-0)
storage/ndb/test/ndbapi/testBackup.cpp (+4/-0)
storage/ndb/test/ndbapi/testBasic.cpp (+4/-0)
storage/ndb/test/ndbapi/testBasicAsynch.cpp (+4/-0)
storage/ndb/test/ndbapi/testBlobs.cpp (+4/-0)
storage/ndb/test/ndbapi/testDataBuffers.cpp (+4/-0)
storage/ndb/test/ndbapi/testDeadlock.cpp (+4/-0)
storage/ndb/test/ndbapi/testDict.cpp (+4/-0)
storage/ndb/test/ndbapi/testGrepVerify.cpp (+4/-0)
storage/ndb/test/ndbapi/testIndex.cpp (+4/-0)
storage/ndb/test/ndbapi/testInterpreter.cpp (+4/-0)
storage/ndb/test/ndbapi/testMgm.cpp (+4/-0)
storage/ndb/test/ndbapi/testNDBT.cpp (+4/-0)
storage/ndb/test/ndbapi/testNdbApi.cpp (+4/-0)
storage/ndb/test/ndbapi/testNodeRestart.cpp (+4/-0)
storage/ndb/test/ndbapi/testOIBasic.cpp (+4/-0)
storage/ndb/test/ndbapi/testOperations.cpp (+4/-0)
storage/ndb/test/ndbapi/testOrderedIndex.cpp (+4/-0)
storage/ndb/test/ndbapi/testPartitioning.cpp (+4/-0)
storage/ndb/test/ndbapi/testReadPerf.cpp (+4/-0)
storage/ndb/test/ndbapi/testRestartGci.cpp (+4/-0)
storage/ndb/test/ndbapi/testSRBank.cpp (+4/-0)
storage/ndb/test/ndbapi/testScan.cpp (+4/-0)
storage/ndb/test/ndbapi/testScanInterpreter.cpp (+4/-0)
storage/ndb/test/ndbapi/testScanPerf.cpp (+4/-0)
storage/ndb/test/ndbapi/testSystemRestart.cpp (+4/-0)
storage/ndb/test/ndbapi/testTimeout.cpp (+4/-0)
storage/ndb/test/ndbapi/testTransactions.cpp (+4/-0)
storage/ndb/test/ndbapi/test_event.cpp (+4/-0)
storage/ndb/test/ndbapi/userInterface.cpp (+4/-0)
storage/ndb/test/ndbnet/test.run (+4/-0)
storage/ndb/test/ndbnet/testError.run (+4/-0)
storage/ndb/test/ndbnet/testMNF.run (+4/-0)
storage/ndb/test/ndbnet/testNR.run (+4/-0)
storage/ndb/test/ndbnet/testNR1.run (+4/-0)
storage/ndb/test/ndbnet/testNR4.run (+4/-0)
storage/ndb/test/ndbnet/testSRhang.run (+4/-0)
storage/ndb/test/ndbnet/testTR295.run (+4/-0)
storage/ndb/test/newtonapi/basic_test/basic/basic.cpp (+4/-0)
storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp (+4/-0)
storage/ndb/test/newtonapi/basic_test/common.cpp (+4/-0)
storage/ndb/test/newtonapi/basic_test/common.hpp (+4/-0)
storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp (+4/-0)
storage/ndb/test/newtonapi/basic_test/too_basic.cpp (+4/-0)
storage/ndb/test/newtonapi/perf_test/perf.cpp (+4/-0)
storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp (+4/-0)
storage/ndb/test/odbc/SQL99_test/SQL99_test.h (+4/-0)
storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp (+4/-0)
storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp (+4/-0)
storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp (+4/-0)
storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLBindColTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLBindParameterTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLCancelTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLColAttributeTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLConnectTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLCopyDescTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLDescribeColTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLDisconnectTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLEndTranTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLErrorTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLExecDirectTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLExecuteTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLFetchTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLGetDataTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLGetInfoTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLParamDataTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLPrepareTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLPutDataTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLRowCountTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLTablesTest.cpp (+4/-0)
storage/ndb/test/odbc/client/SQLTransactTest.cpp (+4/-0)
storage/ndb/test/odbc/client/common.hpp (+4/-0)
storage/ndb/test/odbc/client/main.cpp (+4/-0)
storage/ndb/test/odbc/driver/testOdbcDriver.cpp (+4/-0)
storage/ndb/test/odbc/test_compiler/test_compiler.cpp (+4/-0)
storage/ndb/test/run-test/atrt-analyze-result.sh (+4/-0)
storage/ndb/test/run-test/atrt-clear-result.sh (+4/-0)
storage/ndb/test/run-test/atrt-gather-result.sh (+4/-0)
storage/ndb/test/run-test/atrt-setup.sh (+4/-0)
storage/ndb/test/run-test/atrt-testBackup (+4/-0)
storage/ndb/test/run-test/atrt.hpp (+4/-0)
storage/ndb/test/run-test/make-index.sh (+4/-0)
storage/ndb/test/src/CpcClient.cpp (+4/-0)
storage/ndb/test/src/DbUtil.cpp (+4/-0)
storage/ndb/test/src/HugoAsynchTransactions.cpp (+4/-0)
storage/ndb/test/src/HugoCalculator.cpp (+4/-0)
storage/ndb/test/src/HugoOperations.cpp (+4/-0)
storage/ndb/test/src/HugoTransactions.cpp (+4/-0)
storage/ndb/test/src/NDBT_Error.cpp (+4/-0)
storage/ndb/test/src/NDBT_Output.cpp (+4/-0)
storage/ndb/test/src/NDBT_ResultRow.cpp (+4/-0)
storage/ndb/test/src/NDBT_ReturnCodes.cpp (+4/-0)
storage/ndb/test/src/NDBT_Table.cpp (+4/-0)
storage/ndb/test/src/NDBT_Tables.cpp (+4/-0)
storage/ndb/test/src/NDBT_Thread.cpp (+4/-0)
storage/ndb/test/src/NdbBackup.cpp (+4/-0)
storage/ndb/test/src/NdbConfig.cpp (+4/-0)
storage/ndb/test/src/NdbGrep.cpp (+4/-0)
storage/ndb/test/src/NdbMixRestarter.cpp (+4/-0)
storage/ndb/test/src/NdbRestarter.cpp (+4/-0)
storage/ndb/test/src/NdbRestarts.cpp (+4/-0)
storage/ndb/test/src/NdbSchemaCon.cpp (+4/-0)
storage/ndb/test/src/NdbSchemaOp.cpp (+4/-0)
storage/ndb/test/src/UtilTransactions.cpp (+4/-0)
storage/ndb/test/tools/copy_tab.cpp (+4/-0)
storage/ndb/test/tools/cpcc.cpp (+4/-0)
storage/ndb/test/tools/create_index.cpp (+4/-0)
storage/ndb/test/tools/hugoCalculator.cpp (+4/-0)
storage/ndb/test/tools/hugoFill.cpp (+4/-0)
storage/ndb/test/tools/hugoLoad.cpp (+4/-0)
storage/ndb/test/tools/hugoLockRecords.cpp (+4/-0)
storage/ndb/test/tools/hugoPkDelete.cpp (+4/-0)
storage/ndb/test/tools/hugoPkRead.cpp (+4/-0)
storage/ndb/test/tools/hugoPkReadRecord.cpp (+4/-0)
storage/ndb/test/tools/hugoPkUpdate.cpp (+4/-0)
storage/ndb/test/tools/hugoScanRead.cpp (+4/-0)
storage/ndb/test/tools/hugoScanUpdate.cpp (+4/-0)
storage/ndb/test/tools/listen.cpp (+4/-0)
storage/ndb/test/tools/rep_latency.cpp (+4/-0)
storage/ndb/test/tools/restart.cpp (+4/-0)
storage/ndb/test/tools/transproxy.cpp (+4/-0)
storage/ndb/test/tools/verify_index.cpp (+4/-0)
storage/ndb/tools/clean-links.sh (+4/-0)
storage/ndb/tools/make-errors.pl (+4/-0)
storage/ndb/tools/make-links.sh (+4/-0)
storage/ndb/tools/ndb_error_reporter (+4/-0)
storage/ndb/tools/ndb_test_platform.cpp (+4/-0)
storage/ndb/tools/ndbsql.cpp (+4/-0)
storage/ndb/tools/restore/Restore.cpp (+4/-0)
storage/ndb/tools/restore/Restore.hpp (+4/-0)
storage/ndb/tools/restore/consumer.cpp (+4/-0)
storage/ndb/tools/restore/consumer.hpp (+4/-0)
storage/ndb/tools/restore/consumer_printer.cpp (+4/-0)
storage/ndb/tools/restore/consumer_printer.hpp (+4/-0)
storage/ndb/tools/restore/consumer_restore.hpp (+4/-0)
storage/ndb/tools/restore/consumer_restorem.cpp (+4/-0)
storage/ndb/tools/restore/ndb_nodegroup_map.h (+4/-0)
storage/ndb/tools/rgrep (+4/-0)
Text conflict in CMakeLists.txt
Contents conflict in Makefile-ps
Text conflict in UDF/configure.ac
Text conflict in VERSION
Text conflict in build-ps/build-binary.sh
Text conflict in build-ps/debian/control
Path conflict: build-ps/debian/libperconaserverclient18-dev.files / build-ps/debian/libperconaserverclient-dev.files
Text conflict in build-ps/debian/rules
Text conflict in doc/source/conf.py
Text conflict in doc/source/installation/apt_repo.rst
Text conflict in doc/source/release-notes/release-notes_index.rst
Text conflict in doc/source/upstream-bug-fixes.rst
Text conflict in extra/yassl/src/handshake.cpp
Text conflict in extra/yassl/src/yassl_imp.cpp
Text conflict in libmysql/CMakeLists.txt
Text conflict in man/comp_err.1
Text conflict in man/innochecksum.1
Text conflict in man/msql2mysql.1
Text conflict in man/my_print_defaults.1
Text conflict in man/myisam_ftdump.1
Text conflict in man/myisamchk.1
Text conflict in man/myisamlog.1
Text conflict in man/myisampack.1
Text conflict in man/mysql-stress-test.pl.1
Text conflict in man/mysql-test-run.pl.1
Text conflict in man/mysql.1
Text conflict in man/mysql.server.1
Text conflict in man/mysql_client_test.1
Text conflict in man/mysql_config.1
Text conflict in man/mysql_convert_table_format.1
Text conflict in man/mysql_find_rows.1
Text conflict in man/mysql_fix_extensions.1
Text conflict in man/mysql_install_db.1
Text conflict in man/mysql_plugin.1
Text conflict in man/mysql_secure_installation.1
Text conflict in man/mysql_setpermission.1
Text conflict in man/mysql_tzinfo_to_sql.1
Text conflict in man/mysql_upgrade.1
Text conflict in man/mysql_waitpid.1
Text conflict in man/mysql_zap.1
Text conflict in man/mysqlaccess.1
Text conflict in man/mysqladmin.1
Text conflict in man/mysqlbinlog.1
Text conflict in man/mysqlbug.1
Text conflict in man/mysqlcheck.1
Text conflict in man/mysqld.8
Text conflict in man/mysqld_multi.1
Text conflict in man/mysqld_safe.1
Text conflict in man/mysqldump.1
Text conflict in man/mysqldumpslow.1
Text conflict in man/mysqlhotcopy.1
Text conflict in man/mysqlimport.1
Text conflict in man/mysqlshow.1
Text conflict in man/mysqlslap.1
Text conflict in man/mysqltest.1
Text conflict in man/ndb-common-options.1
Text conflict in man/ndb_blob_tool.1
Text conflict in man/ndb_config.1
Text conflict in man/ndb_cpcd.1
Text conflict in man/ndb_delete_all.1
Text conflict in man/ndb_desc.1
Text conflict in man/ndb_drop_index.1
Text conflict in man/ndb_drop_table.1
Text conflict in man/ndb_error_reporter.1
Text conflict in man/ndb_index_stat.1
Text conflict in man/ndb_mgm.1
Text conflict in man/ndb_mgmd.8
Text conflict in man/ndb_print_backup_file.1
Text conflict in man/ndb_print_schema_file.1
Text conflict in man/ndb_print_sys_file.1
Text conflict in man/ndb_restore.1
Text conflict in man/ndb_select_all.1
Text conflict in man/ndb_select_count.1
Text conflict in man/ndb_show_tables.1
Text conflict in man/ndb_size.pl.1
Text conflict in man/ndb_waiter.1
Text conflict in man/ndbd.8
Text conflict in man/ndbd_redo_log_reader.1
Text conflict in man/ndbinfo_select_all.1
Text conflict in man/ndbmtd.8
Text conflict in man/perror.1
Text conflict in man/replace.1
Text conflict in man/resolve_stack_dump.1
Text conflict in man/resolveip.1
Text conflict in mysql-test/include/audit_log_events.inc
Text conflict in mysql-test/r/audit_log.result
Text conflict in mysys/my_libwrap.c
Text conflict in packaging/rpm-oel/CMakeLists.txt
Text conflict in packaging/rpm-oel/mysql.spec.in
Text conflict in plugin/audit_log/audit_log.c
Text conflict in scripts/CMakeLists.txt
Text conflict in scripts/comp_sql.c
Text conflict in scripts/mysql_config.pl.in
Text conflict in scripts/mysql_config.sh
Text conflict in scripts/mysql_install_db.pl.in
Text conflict in scripts/mysql_install_db.sh
Text conflict in sql/filesort.cc
Text conflict in sql/log_event.cc
Text conflict in sql/log_event.h
Text conflict in sql/mysqld.cc
Text conflict in sql/share/charsets/Index.xml
Text conflict in sql/share/charsets/ascii.xml
Text conflict in sql/share/charsets/cp1250.xml
Text conflict in sql/share/charsets/hebrew.xml
Text conflict in sql/share/charsets/latin1.xml
Text conflict in sql/share/charsets/latin2.xml
Text conflict in sql/share/charsets/latin5.xml
Text conflict in storage/innobase/include/univ.i
Text conflict in storage/myisam/ftbench/Ecompare.pl
Text conflict in storage/myisam/ftbench/Ecreate.pl
Text conflict in storage/myisam/ftbench/Ereport.pl
Text conflict in storage/ndb/config/win-includes
Text conflict in storage/ndb/config/win-libraries
Text conflict in storage/ndb/config/win-name
Text conflict in storage/ndb/config/win-sources
Text conflict in storage/ndb/include/debugger/DebuggerNames.hpp
Text conflict in storage/ndb/include/debugger/EventLogger.hpp
Text conflict in storage/ndb/include/debugger/GrepError.hpp
Text conflict in storage/ndb/include/debugger/SignalLoggerManager.hpp
Text conflict in storage/ndb/include/editline/editline.h
Text conflict in storage/ndb/include/kernel/AttributeDescriptor.hpp
Text conflict in storage/ndb/include/kernel/AttributeHeader.hpp
Text conflict in storage/ndb/include/kernel/AttributeList.hpp
Text conflict in storage/ndb/include/kernel/BlockNumbers.h
Text conflict in storage/ndb/include/kernel/GlobalSignalNumbers.h
Text conflict in storage/ndb/include/kernel/GrepEvent.hpp
Text conflict in storage/ndb/include/kernel/Interpreter.hpp
Text conflict in storage/ndb/include/kernel/LogLevel.hpp
Text conflict in storage/ndb/include/kernel/NodeBitmask.hpp
Text conflict in storage/ndb/include/kernel/NodeInfo.hpp
Text conflict in storage/ndb/include/kernel/NodeState.hpp
Text conflict in storage/ndb/include/kernel/RefConvert.hpp
Text conflict in storage/ndb/include/kernel/kernel_types.h
Text conflict in storage/ndb/include/kernel/ndb_limits.h
Text conflict in storage/ndb/include/kernel/signaldata/AbortAll.hpp
Text conflict in storage/ndb/include/kernel/signaldata/AccFrag.hpp
Text conflict in storage/ndb/include/kernel/signaldata/AccScan.hpp
Text conflict in storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/AllocNodeId.hpp
Text conflict in storage/ndb/include/kernel/signaldata/AlterIndx.hpp
Text conflict in storage/ndb/include/kernel/signaldata/AlterTable.hpp
Text conflict in storage/ndb/include/kernel/signaldata/AlterTrig.hpp
Text conflict in storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp
Text conflict in storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp
Text conflict in storage/ndb/include/kernel/signaldata/ApiVersion.hpp
Text conflict in storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp
Text conflict in storage/ndb/include/kernel/signaldata/AttrInfo.hpp
Text conflict in storage/ndb/include/kernel/signaldata/BackupImpl.hpp
Text conflict in storage/ndb/include/kernel/signaldata/BackupSignalData.hpp
Text conflict in storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp
Text conflict in storage/ndb/include/kernel/signaldata/BuildIndx.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CmInit.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/ConfigParamId.hpp
Text conflict in storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CopyActive.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CopyFrag.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CreateEvnt.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CreateFrag.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CreateIndx.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CreateTab.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CreateTable.hpp
Text conflict in storage/ndb/include/kernel/signaldata/CreateTrig.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DiAddTab.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DiGetNodes.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DictLock.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DictObjOp.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DictStart.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DihAddFrag.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DihContinueB.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DihStartTab.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DisconnectRep.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DropFilegroup.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DropIndx.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DropObj.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DropTab.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DropTabFile.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DropTable.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DropTrig.hpp
Text conflict in storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
Text conflict in storage/ndb/include/kernel/signaldata/EmptyLcp.hpp
Text conflict in storage/ndb/include/kernel/signaldata/EndTo.hpp
Text conflict in storage/ndb/include/kernel/signaldata/EventReport.hpp
Text conflict in storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/ExecFragReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/Extent.hpp
Text conflict in storage/ndb/include/kernel/signaldata/FailRep.hpp
Text conflict in storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp
Text conflict in storage/ndb/include/kernel/signaldata/FsAppendReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/FsCloseReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/FsConf.hpp
Text conflict in storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/FsRef.hpp
Text conflict in storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/GCPSave.hpp
Text conflict in storage/ndb/include/kernel/signaldata/GetTabInfo.hpp
Text conflict in storage/ndb/include/kernel/signaldata/GetTableId.hpp
Text conflict in storage/ndb/include/kernel/signaldata/GrepImpl.hpp
Text conflict in storage/ndb/include/kernel/signaldata/HotSpareRep.hpp
Text conflict in storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp
Text conflict in storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp
Text conflict in storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp
Text conflict in storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/KeyInfo.hpp
Text conflict in storage/ndb/include/kernel/signaldata/LCP.hpp
Text conflict in storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp
Text conflict in storage/ndb/include/kernel/signaldata/ListTables.hpp
Text conflict in storage/ndb/include/kernel/signaldata/LqhFrag.hpp
Text conflict in storage/ndb/include/kernel/signaldata/LqhKey.hpp
Text conflict in storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/LqhTransConf.hpp
Text conflict in storage/ndb/include/kernel/signaldata/ManagementServer.hpp
Text conflict in storage/ndb/include/kernel/signaldata/MasterGCP.hpp
Text conflict in storage/ndb/include/kernel/signaldata/MasterLCP.hpp
Text conflict in storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp
Text conflict in storage/ndb/include/kernel/signaldata/NdbSttor.hpp
Text conflict in storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp
Text conflict in storage/ndb/include/kernel/signaldata/NextScan.hpp
Text conflict in storage/ndb/include/kernel/signaldata/NodeFailRep.hpp
Text conflict in storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp
Text conflict in storage/ndb/include/kernel/signaldata/PackedSignal.hpp
Text conflict in storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp
Text conflict in storage/ndb/include/kernel/signaldata/PrepDropTab.hpp
Text conflict in storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp
Text conflict in storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp
Text conflict in storage/ndb/include/kernel/signaldata/RelTabMem.hpp
Text conflict in storage/ndb/include/kernel/signaldata/RepImpl.hpp
Text conflict in storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp
Text conflict in storage/ndb/include/kernel/signaldata/RestoreImpl.hpp
Text conflict in storage/ndb/include/kernel/signaldata/ResumeReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/RouteOrd.hpp
Text conflict in storage/ndb/include/kernel/signaldata/ScanFrag.hpp
Text conflict in storage/ndb/include/kernel/signaldata/ScanTab.hpp
Text conflict in storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp
Text conflict in storage/ndb/include/kernel/signaldata/SetVarReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/SignalData.hpp
Text conflict in storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp
Text conflict in storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp
Text conflict in storage/ndb/include/kernel/signaldata/SrFragidConf.hpp
Text conflict in storage/ndb/include/kernel/signaldata/StartFragReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/StartInfo.hpp
Text conflict in storage/ndb/include/kernel/signaldata/StartMe.hpp
Text conflict in storage/ndb/include/kernel/signaldata/StartOrd.hpp
Text conflict in storage/ndb/include/kernel/signaldata/StartPerm.hpp
Text conflict in storage/ndb/include/kernel/signaldata/StartRec.hpp
Text conflict in storage/ndb/include/kernel/signaldata/StartTo.hpp
Text conflict in storage/ndb/include/kernel/signaldata/StopMe.hpp
Text conflict in storage/ndb/include/kernel/signaldata/StopPerm.hpp
Text conflict in storage/ndb/include/kernel/signaldata/StopReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/SumaImpl.hpp
Text conflict in storage/ndb/include/kernel/signaldata/SystemError.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TamperOrd.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TcCommit.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TcContinueB.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TcHbRep.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TcIndx.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TcKeyConf.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TcKeyRef.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TestOrd.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TransIdAI.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TupCommit.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TupFrag.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TupKey.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TuxBound.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TuxContinueB.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TuxMaint.hpp
Text conflict in storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp
Text conflict in storage/ndb/include/kernel/signaldata/UpdateTo.hpp
Text conflict in storage/ndb/include/kernel/signaldata/UtilDelete.hpp
Text conflict in storage/ndb/include/kernel/signaldata/UtilExecute.hpp
Text conflict in storage/ndb/include/kernel/signaldata/UtilLock.hpp
Text conflict in storage/ndb/include/kernel/signaldata/UtilPrepare.hpp
Text conflict in storage/ndb/include/kernel/signaldata/UtilRelease.hpp
Text conflict in storage/ndb/include/kernel/signaldata/UtilSequence.hpp
Text conflict in storage/ndb/include/kernel/signaldata/WaitGCP.hpp
Text conflict in storage/ndb/include/kernel/trigger_definitions.h
Text conflict in storage/ndb/include/logger/ConsoleLogHandler.hpp
Text conflict in storage/ndb/include/logger/FileLogHandler.hpp
Text conflict in storage/ndb/include/logger/LogHandler.hpp
Text conflict in storage/ndb/include/logger/Logger.hpp
Text conflict in storage/ndb/include/logger/SysLogHandler.hpp
Text conflict in storage/ndb/include/mgmapi/mgmapi.h
Text conflict in storage/ndb/include/mgmapi/mgmapi_debug.h
Text conflict in storage/ndb/include/mgmapi/mgmapi_error.h
Text conflict in storage/ndb/include/mgmapi/ndb_logevent.h
Text conflict in storage/ndb/include/mgmapi/ndbd_exit_codes.h
Text conflict in storage/ndb/include/mgmcommon/ConfigRetriever.hpp
Text conflict in storage/ndb/include/mgmcommon/IPCConfig.hpp
Text conflict in storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp
Text conflict in storage/ndb/include/ndb_constants.h
Text conflict in storage/ndb/include/ndb_global.h.in
Text conflict in storage/ndb/include/ndb_init.h
Text conflict in storage/ndb/include/ndb_types.h.in
Text conflict in storage/ndb/include/ndb_version.h.in
Text conflict in storage/ndb/include/ndbapi/Ndb.hpp
Text conflict in storage/ndb/include/ndbapi/NdbApi.hpp
Text conflict in storage/ndb/include/ndbapi/NdbBlob.hpp
Text conflict in storage/ndb/include/ndbapi/NdbDictionary.hpp
Text conflict in storage/ndb/include/ndbapi/NdbError.hpp
Text conflict in storage/ndb/include/ndbapi/NdbEventOperation.hpp
Text conflict in storage/ndb/include/ndbapi/NdbIndexOperation.hpp
Text conflict in storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
Text conflict in storage/ndb/include/ndbapi/NdbIndexStat.hpp
Text conflict in storage/ndb/include/ndbapi/NdbOperation.hpp
Text conflict in storage/ndb/include/ndbapi/NdbPool.hpp
Text conflict in storage/ndb/include/ndbapi/NdbRecAttr.hpp
Text conflict in storage/ndb/include/ndbapi/NdbReceiver.hpp
Text conflict in storage/ndb/include/ndbapi/NdbScanFilter.hpp
Text conflict in storage/ndb/include/ndbapi/NdbScanOperation.hpp
Text conflict in storage/ndb/include/ndbapi/NdbTransaction.hpp
Text conflict in storage/ndb/include/ndbapi/ndb_cluster_connection.hpp
Text conflict in storage/ndb/include/ndbapi/ndb_opt_defaults.h
Text conflict in storage/ndb/include/ndbapi/ndbapi_limits.h
Text conflict in storage/ndb/include/ndbapi/ndberror.h
Text conflict in storage/ndb/include/newtonapi/dba.h
Text conflict in storage/ndb/include/newtonapi/defs/pcn_types.h
Text conflict in storage/ndb/include/portlib/NdbCondition.h
Text conflict in storage/ndb/include/portlib/NdbConfig.h
Text conflict in storage/ndb/include/portlib/NdbDaemon.h
Text conflict in storage/ndb/include/portlib/NdbEnv.h
Text conflict in storage/ndb/include/portlib/NdbHost.h
Text conflict in storage/ndb/include/portlib/NdbMain.h
Text conflict in storage/ndb/include/portlib/NdbMem.h
Text conflict in storage/ndb/include/portlib/NdbMutex.h
Text conflict in storage/ndb/include/portlib/NdbSleep.h
Text conflict in storage/ndb/include/portlib/NdbTCP.h
Text conflict in storage/ndb/include/portlib/NdbThread.h
Text conflict in storage/ndb/include/portlib/NdbTick.h
Text conflict in storage/ndb/include/portlib/PortDefs.h
Text conflict in storage/ndb/include/portlib/prefetch.h
Text conflict in storage/ndb/include/transporter/TransporterCallback.hpp
Text conflict in storage/ndb/include/transporter/TransporterDefinitions.hpp
Text conflict in storage/ndb/include/transporter/TransporterRegistry.hpp
Text conflict in storage/ndb/include/util/BaseString.hpp
Text conflict in storage/ndb/include/util/Bitmask.hpp
Text conflict in storage/ndb/include/util/File.hpp
Text conflict in storage/ndb/include/util/InputStream.hpp
Text conflict in storage/ndb/include/util/NdbOut.hpp
Text conflict in storage/ndb/include/util/NdbSqlUtil.hpp
Text conflict in storage/ndb/include/util/OutputStream.hpp
Text conflict in storage/ndb/include/util/Parser.hpp
Text conflict in storage/ndb/include/util/Properties.hpp
Text conflict in storage/ndb/include/util/SimpleProperties.hpp
Text conflict in storage/ndb/include/util/SocketAuthenticator.hpp
Text conflict in storage/ndb/include/util/SocketClient.hpp
Text conflict in storage/ndb/include/util/SocketServer.hpp
Text conflict in storage/ndb/include/util/UtilBuffer.hpp
Text conflict in storage/ndb/include/util/Vector.hpp
Text conflict in storage/ndb/include/util/basestring_vsnprintf.h
Text conflict in storage/ndb/include/util/md5_hash.hpp
Text conflict in storage/ndb/include/util/ndb_rand.h
Text conflict in storage/ndb/include/util/random.h
Text conflict in storage/ndb/include/util/socket_io.h
Text conflict in storage/ndb/include/util/uucode.h
Text conflict in storage/ndb/include/util/version.h
Text conflict in storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp
Text conflict in storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp
Text conflict in storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp
Text conflict in storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp
Text conflict in storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp
Text conflict in storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp
Text conflict in storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp
Text conflict in storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp
Text conflict in storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp
Text conflict in storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp
Text conflict in storage/ndb/src/common/debugger/BlockNames.cpp
Text conflict in storage/ndb/src/common/debugger/DebuggerNames.cpp
Text conflict in storage/ndb/src/common/debugger/EventLogger.cpp
Text conflict in storage/ndb/src/common/debugger/GrepError.cpp
Text conflict in storage/ndb/src/common/debugger/SignalLoggerManager.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/AccLock.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/AlterTab.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/AlterTable.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/ContinueB.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/DropIndx.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/DropTab.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/DropTrig.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/FailRep.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/FsConf.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/FsRef.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/GCPSave.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/LCP.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/LqhKey.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/StartRec.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/SystemError.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/TcIndx.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/TupCommit.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/TupKey.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/UtilLock.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp
Text conflict in storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp
Text conflict in storage/ndb/src/common/logger/ConsoleLogHandler.cpp
Text conflict in storage/ndb/src/common/logger/FileLogHandler.cpp
Text conflict in storage/ndb/src/common/logger/LogHandler.cpp
Text conflict in storage/ndb/src/common/logger/LogHandlerList.cpp
Text conflict in storage/ndb/src/common/logger/LogHandlerList.hpp
Text conflict in storage/ndb/src/common/logger/Logger.cpp
Text conflict in storage/ndb/src/common/logger/SysLogHandler.cpp
Text conflict in storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp
Text conflict in storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp
Text conflict in storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp
Text conflict in storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp
Text conflict in storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
Text conflict in storage/ndb/src/common/mgmcommon/IPCConfig.cpp
Text conflict in storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp
Text conflict in storage/ndb/src/common/portlib/NdbCondition.c
Text conflict in storage/ndb/src/common/portlib/NdbConfig.c
Text conflict in storage/ndb/src/common/portlib/NdbDaemon.c
Text conflict in storage/ndb/src/common/portlib/NdbEnv.c
Text conflict in storage/ndb/src/common/portlib/NdbHost.c
Text conflict in storage/ndb/src/common/portlib/NdbMem.c
Text conflict in storage/ndb/src/common/portlib/NdbPortLibTest.cpp
Text conflict in storage/ndb/src/common/portlib/NdbSleep.c
Text conflict in storage/ndb/src/common/portlib/NdbTCP.cpp
Text conflict in storage/ndb/src/common/portlib/NdbThread.c
Text conflict in storage/ndb/src/common/portlib/NdbTick.c
Text conflict in storage/ndb/src/common/portlib/memtest.c
Text conflict in storage/ndb/src/common/portlib/mmstest.cpp
Text conflict in storage/ndb/src/common/portlib/munmaptest.cpp
Text conflict in storage/ndb/src/common/portlib/win32/NdbCondition.c
Text conflict in storage/ndb/src/common/portlib/win32/NdbDaemon.c
Text conflict in storage/ndb/src/common/portlib/win32/NdbEnv.c
Text conflict in storage/ndb/src/common/portlib/win32/NdbHost.c
Text conflict in storage/ndb/src/common/portlib/win32/NdbMem.c
Text conflict in storage/ndb/src/common/portlib/win32/NdbMutex.c
Text conflict in storage/ndb/src/common/portlib/win32/NdbSleep.c
Text conflict in storage/ndb/src/common/portlib/win32/NdbTCP.c
Text conflict in storage/ndb/src/common/portlib/win32/NdbThread.c
Text conflict in storage/ndb/src/common/portlib/win32/NdbTick.c
Text conflict in storage/ndb/src/common/transporter/Packer.cpp
Text conflict in storage/ndb/src/common/transporter/Packer.hpp
Text conflict in storage/ndb/src/common/transporter/SCI_Transporter.cpp
Text conflict in storage/ndb/src/common/transporter/SCI_Transporter.hpp
Text conflict in storage/ndb/src/common/transporter/SHM_Buffer.hpp
Text conflict in storage/ndb/src/common/transporter/SHM_Transporter.cpp
Text conflict in storage/ndb/src/common/transporter/SHM_Transporter.hpp
Text conflict in storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp
Text conflict in storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp
Text conflict in storage/ndb/src/common/transporter/SendBuffer.cpp
Text conflict in storage/ndb/src/common/transporter/SendBuffer.hpp
Text conflict in storage/ndb/src/common/transporter/TCP_Transporter.cpp
Text conflict in storage/ndb/src/common/transporter/TCP_Transporter.hpp
Text conflict in storage/ndb/src/common/transporter/Transporter.cpp
Text conflict in storage/ndb/src/common/transporter/Transporter.hpp
Text conflict in storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp
Text conflict in storage/ndb/src/common/transporter/TransporterRegistry.cpp
Text conflict in storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp
Text conflict in storage/ndb/src/common/transporter/buddy.cpp
Text conflict in storage/ndb/src/common/transporter/buddy.hpp
Text conflict in storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp
Text conflict in storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp
Text conflict in storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp
Text conflict in storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp
Text conflict in storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp
Text conflict in storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp
Text conflict in storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp
Text conflict in storage/ndb/src/common/util/BaseString.cpp
Text conflict in storage/ndb/src/common/util/File.cpp
Text conflict in storage/ndb/src/common/util/InputStream.cpp
Text conflict in storage/ndb/src/common/util/NdbOut.cpp
Text conflict in storage/ndb/src/common/util/NdbSqlUtil.cpp
Text conflict in storage/ndb/src/common/util/OutputStream.cpp
Text conflict in storage/ndb/src/common/util/Parser.cpp
Text conflict in storage/ndb/src/common/util/Properties.cpp
Text conflict in storage/ndb/src/common/util/SimpleProperties.cpp
Text conflict in storage/ndb/src/common/util/SocketAuthenticator.cpp
Text conflict in storage/ndb/src/common/util/SocketClient.cpp
Text conflict in storage/ndb/src/common/util/SocketServer.cpp
Text conflict in storage/ndb/src/common/util/basestring_vsnprintf.c
Text conflict in storage/ndb/src/common/util/filetest/FileUnitTest.cpp
Text conflict in storage/ndb/src/common/util/filetest/FileUnitTest.hpp
Text conflict in storage/ndb/src/common/util/md5_hash.cpp
Text conflict in storage/ndb/src/common/util/ndb_init.c
Text conflict in storage/ndb/src/common/util/ndb_rand.c
Text conflict in storage/ndb/src/common/util/random.c
Text conflict in storage/ndb/src/common/util/socket_io.cpp
Text conflict in storage/ndb/src/common/util/strdup.c
Text conflict in storage/ndb/src/common/util/testProperties/testProperties.cpp
Text conflict in storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp
Text conflict in storage/ndb/src/common/util/uucode.c
Text conflict in storage/ndb/src/common/util/version.c
Text conflict in storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp
Text conflict in storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h
Text conflict in storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp
Text conflict in storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp
Text conflict in storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h
Text conflict in storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp
Text conflict in storage/ndb/src/cw/cpcc-win32/C++/TreeView.h
Text conflict in storage/ndb/src/cw/cpcc-win32/C++/resource.h
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/Database.cs
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/Process.cs
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs
Text conflict in storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
Text conflict in storage/ndb/src/cw/cpcd/APIService.cpp
Text conflict in storage/ndb/src/cw/cpcd/APIService.hpp
Text conflict in storage/ndb/src/cw/cpcd/CPCD.cpp
Text conflict in storage/ndb/src/cw/cpcd/CPCD.hpp
Text conflict in storage/ndb/src/cw/cpcd/Monitor.cpp
Text conflict in storage/ndb/src/cw/cpcd/Process.cpp
Text conflict in storage/ndb/src/cw/cpcd/common.cpp
Text conflict in storage/ndb/src/cw/cpcd/common.hpp
Text conflict in storage/ndb/src/cw/test/socketclient/socketClientTest.cpp
Text conflict in storage/ndb/src/cw/util/ClientInterface.cpp
Text conflict in storage/ndb/src/cw/util/ClientInterface.hpp
Text conflict in storage/ndb/src/cw/util/SocketRegistry.cpp
Text conflict in storage/ndb/src/cw/util/SocketRegistry.hpp
Text conflict in storage/ndb/src/cw/util/SocketService.cpp
Text conflict in storage/ndb/src/cw/util/SocketService.hpp
Text conflict in storage/ndb/src/kernel/SimBlockList.cpp
Text conflict in storage/ndb/src/kernel/blocks/backup/Backup.cpp
Text conflict in storage/ndb/src/kernel/blocks/backup/Backup.hpp
Text conflict in storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
Text conflict in storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
Text conflict in storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp
Text conflict in storage/ndb/src/kernel/blocks/backup/read.cpp
Text conflict in storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
Text conflict in storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
Text conflict in storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
Text conflict in storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
Text conflict in storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
Text conflict in storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
Text conflict in storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
Text conflict in storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp
Text conflict in storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
Text conflict in storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
Text conflict in storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
Text conflict in storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp
Text conflict in storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
Text conflict in storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
Text conflict in storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
Text conflict in storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp
Text conflict in storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
Text conflict in storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
Text conflict in storage/ndb/src/kernel/blocks/diskpage.hpp
Text conflict in storage/ndb/src/kernel/blocks/lgman.hpp
Text conflict in storage/ndb/src/kernel/blocks/mutexes.hpp
Text conflict in storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
Text conflict in storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
Text conflict in storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
Text conflict in storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp
Text conflict in storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
Text conflict in storage/ndb/src/kernel/blocks/pgman.cpp
Text conflict in storage/ndb/src/kernel/blocks/pgman.hpp
Text conflict in storage/ndb/src/kernel/blocks/print_file.cpp
Text conflict in storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
Text conflict in storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
Text conflict in storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
Text conflict in storage/ndb/src/kernel/blocks/qmgr/timer.hpp
Text conflict in storage/ndb/src/kernel/blocks/record_types.hpp
Text conflict in storage/ndb/src/kernel/blocks/restore.cpp
Text conflict in storage/ndb/src/kernel/blocks/restore.hpp
Text conflict in storage/ndb/src/kernel/blocks/suma/Suma.cpp
Text conflict in storage/ndb/src/kernel/blocks/suma/Suma.hpp
Text conflict in storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
Text conflict in storage/ndb/src/kernel/blocks/trix/Trix.cpp
Text conflict in storage/ndb/src/kernel/blocks/trix/Trix.hpp
Text conflict in storage/ndb/src/kernel/blocks/tsman.cpp
Text conflict in storage/ndb/src/kernel/blocks/tsman.hpp
Text conflict in storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp
Text conflict in storage/ndb/src/kernel/error/ErrorReporter.cpp
Text conflict in storage/ndb/src/kernel/error/ErrorReporter.hpp
Text conflict in storage/ndb/src/kernel/error/TimeModule.cpp
Text conflict in storage/ndb/src/kernel/error/TimeModule.hpp
Text conflict in storage/ndb/src/kernel/error/ndbd_exit_codes.c
Text conflict in storage/ndb/src/kernel/main.cpp
Text conflict in storage/ndb/src/kernel/vm/Array.hpp
Text conflict in storage/ndb/src/kernel/vm/ArrayPool.hpp
Text conflict in storage/ndb/src/kernel/vm/CArray.hpp
Text conflict in storage/ndb/src/kernel/vm/Callback.hpp
Text conflict in storage/ndb/src/kernel/vm/ClusterConfiguration.cpp
Text conflict in storage/ndb/src/kernel/vm/ClusterConfiguration.hpp
Text conflict in storage/ndb/src/kernel/vm/Configuration.hpp
Text conflict in storage/ndb/src/kernel/vm/DLCFifoList.hpp
Text conflict in storage/ndb/src/kernel/vm/DLCHashTable.hpp
Text conflict in storage/ndb/src/kernel/vm/DLFifoList.hpp
Text conflict in storage/ndb/src/kernel/vm/DLHashTable.hpp
Text conflict in storage/ndb/src/kernel/vm/DLHashTable2.hpp
Text conflict in storage/ndb/src/kernel/vm/DLList.hpp
Text conflict in storage/ndb/src/kernel/vm/DataBuffer.hpp
Text conflict in storage/ndb/src/kernel/vm/DynArr256.cpp
Text conflict in storage/ndb/src/kernel/vm/DynArr256.hpp
Text conflict in storage/ndb/src/kernel/vm/Emulator.cpp
Text conflict in storage/ndb/src/kernel/vm/Emulator.hpp
Text conflict in storage/ndb/src/kernel/vm/FastScheduler.cpp
Text conflict in storage/ndb/src/kernel/vm/FastScheduler.hpp
Text conflict in storage/ndb/src/kernel/vm/GlobalData.hpp
Text conflict in storage/ndb/src/kernel/vm/KeyDescriptor.hpp
Text conflict in storage/ndb/src/kernel/vm/KeyTable.hpp
Text conflict in storage/ndb/src/kernel/vm/KeyTable2.hpp
Text conflict in storage/ndb/src/kernel/vm/KeyTable2Ref.hpp
Text conflict in storage/ndb/src/kernel/vm/LinearPool.hpp
Text conflict in storage/ndb/src/kernel/vm/LongSignal.hpp
Text conflict in storage/ndb/src/kernel/vm/Mutex.cpp
Text conflict in storage/ndb/src/kernel/vm/Mutex.hpp
Text conflict in storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
Text conflict in storage/ndb/src/kernel/vm/NdbdSuperPool.hpp
Text conflict in storage/ndb/src/kernel/vm/Pool.cpp
Text conflict in storage/ndb/src/kernel/vm/Pool.hpp
Text conflict in storage/ndb/src/kernel/vm/Prio.hpp
Text conflict in storage/ndb/src/kernel/vm/RWPool.cpp
Text conflict in storage/ndb/src/kernel/vm/RWPool.hpp
Text conflict in storage/ndb/src/kernel/vm/RequestTracker.hpp
Text conflict in storage/ndb/src/kernel/vm/Rope.hpp
Text conflict in storage/ndb/src/kernel/vm/SLFifoList.hpp
Text conflict in storage/ndb/src/kernel/vm/SLList.hpp
Text conflict in storage/ndb/src/kernel/vm/SafeCounter.cpp
Text conflict in storage/ndb/src/kernel/vm/SafeCounter.hpp
Text conflict in storage/ndb/src/kernel/vm/SectionReader.cpp
Text conflict in storage/ndb/src/kernel/vm/SectionReader.hpp
Text conflict in storage/ndb/src/kernel/vm/SignalCounter.hpp
Text conflict in storage/ndb/src/kernel/vm/SimBlockList.hpp
Text conflict in storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp
Text conflict in storage/ndb/src/kernel/vm/SimulatedBlock.cpp
Text conflict in storage/ndb/src/kernel/vm/SimulatedBlock.hpp
Text conflict in storage/ndb/src/kernel/vm/SuperPool.cpp
Text conflict in storage/ndb/src/kernel/vm/SuperPool.hpp
Text conflict in storage/ndb/src/kernel/vm/ThreadConfig.cpp
Text conflict in storage/ndb/src/kernel/vm/ThreadConfig.hpp
Text conflict in storage/ndb/src/kernel/vm/TimeQueue.cpp
Text conflict in storage/ndb/src/kernel/vm/TimeQueue.hpp
Text conflict in storage/ndb/src/kernel/vm/TransporterCallback.cpp
Text conflict in storage/ndb/src/kernel/vm/VMSignal.cpp
Text conflict in storage/ndb/src/kernel/vm/VMSignal.hpp
Text conflict in storage/ndb/src/kernel/vm/WOPool.cpp
Text conflict in storage/ndb/src/kernel/vm/WOPool.hpp
Text conflict in storage/ndb/src/kernel/vm/WaitQueue.hpp
Text conflict in storage/ndb/src/kernel/vm/WatchDog.cpp
Text conflict in storage/ndb/src/kernel/vm/WatchDog.hpp
Text conflict in storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp
Text conflict in storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
Text conflict in storage/ndb/src/kernel/vm/al_test/main.cpp
Text conflict in storage/ndb/src/kernel/vm/bench_pool.cpp
Text conflict in storage/ndb/src/kernel/vm/ndbd_malloc.cpp
Text conflict in storage/ndb/src/kernel/vm/ndbd_malloc.hpp
Text conflict in storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
Text conflict in storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
Text conflict in storage/ndb/src/kernel/vm/pc.hpp
Text conflict in storage/ndb/src/kernel/vm/testCopy/rr.cpp
Text conflict in storage/ndb/src/kernel/vm/testCopy/testCopy.cpp
Text conflict in storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp
Text conflict in storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
Text conflict in storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp
Text conflict in storage/ndb/src/kernel/vm/testSuperPool.cpp
Text conflict in storage/ndb/src/mgmapi/LocalConfig.cpp
Text conflict in storage/ndb/src/mgmapi/LocalConfig.hpp
Text conflict in storage/ndb/src/mgmapi/mgmapi_configuration.hpp
Text conflict in storage/ndb/src/mgmapi/mgmapi_internal.h
Text conflict in storage/ndb/src/mgmapi/ndb_logevent.hpp
Text conflict in storage/ndb/src/mgmapi/test/keso.c
Text conflict in storage/ndb/src/mgmapi/test/mgmSrvApi.cpp
Text conflict in storage/ndb/src/mgmclient/CommandInterpreter.cpp
Text conflict in storage/ndb/src/mgmclient/ndb_mgmclient.h
Text conflict in storage/ndb/src/mgmclient/ndb_mgmclient.hpp
Text conflict in storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
Text conflict in storage/ndb/src/mgmsrv/Config.cpp
Text conflict in storage/ndb/src/mgmsrv/Config.hpp
Text conflict in storage/ndb/src/mgmsrv/ConfigInfo.cpp
Text conflict in storage/ndb/src/mgmsrv/ConfigInfo.hpp
Text conflict in storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
Text conflict in storage/ndb/src/mgmsrv/MgmtSrvr.cpp
Text conflict in storage/ndb/src/mgmsrv/MgmtSrvr.hpp
Text conflict in storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
Text conflict in storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp
Text conflict in storage/ndb/src/mgmsrv/Services.cpp
Text conflict in storage/ndb/src/mgmsrv/Services.hpp
Text conflict in storage/ndb/src/mgmsrv/SignalQueue.cpp
Text conflict in storage/ndb/src/mgmsrv/SignalQueue.hpp
Text conflict in storage/ndb/src/mgmsrv/convertStrToInt.cpp
Text conflict in storage/ndb/src/mgmsrv/convertStrToInt.hpp
Text conflict in storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
Text conflict in storage/ndb/src/ndbapi/API.hpp
Text conflict in storage/ndb/src/ndbapi/ClusterMgr.cpp
Text conflict in storage/ndb/src/ndbapi/ClusterMgr.hpp
Text conflict in storage/ndb/src/ndbapi/DictCache.hpp
Text conflict in storage/ndb/src/ndbapi/Ndb.cpp
Text conflict in storage/ndb/src/ndbapi/NdbApiSignal.cpp
Text conflict in storage/ndb/src/ndbapi/NdbApiSignal.hpp
Text conflict in storage/ndb/src/ndbapi/NdbBlob.cpp
Text conflict in storage/ndb/src/ndbapi/NdbBlobImpl.hpp
Text conflict in storage/ndb/src/ndbapi/NdbDictionary.cpp
Text conflict in storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
Text conflict in storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
Text conflict in storage/ndb/src/ndbapi/NdbErrorOut.cpp
Text conflict in storage/ndb/src/ndbapi/NdbEventOperation.cpp
Text conflict in storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
Text conflict in storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
Text conflict in storage/ndb/src/ndbapi/NdbImpl.hpp
Text conflict in storage/ndb/src/ndbapi/NdbIndexOperation.cpp
Text conflict in storage/ndb/src/ndbapi/NdbIndexStat.cpp
Text conflict in storage/ndb/src/ndbapi/NdbLinHash.hpp
Text conflict in storage/ndb/src/ndbapi/NdbOperation.cpp
Text conflict in storage/ndb/src/ndbapi/NdbOperationDefine.cpp
Text conflict in storage/ndb/src/ndbapi/NdbOperationExec.cpp
Text conflict in storage/ndb/src/ndbapi/NdbOperationInt.cpp
Text conflict in storage/ndb/src/ndbapi/NdbOperationScan.cpp
Text conflict in storage/ndb/src/ndbapi/NdbOperationSearch.cpp
Text conflict in storage/ndb/src/ndbapi/NdbPool.cpp
Text conflict in storage/ndb/src/ndbapi/NdbPoolImpl.cpp
Text conflict in storage/ndb/src/ndbapi/NdbPoolImpl.hpp
Text conflict in storage/ndb/src/ndbapi/NdbRecAttr.cpp
Text conflict in storage/ndb/src/ndbapi/NdbReceiver.cpp
Text conflict in storage/ndb/src/ndbapi/NdbScanFilter.cpp
Text conflict in storage/ndb/src/ndbapi/NdbScanOperation.cpp
Text conflict in storage/ndb/src/ndbapi/NdbTransaction.cpp
Text conflict in storage/ndb/src/ndbapi/NdbTransactionScan.cpp
Text conflict in storage/ndb/src/ndbapi/NdbUtil.cpp
Text conflict in storage/ndb/src/ndbapi/NdbUtil.hpp
Text conflict in storage/ndb/src/ndbapi/NdbWaiter.hpp
Text conflict in storage/ndb/src/ndbapi/Ndberr.cpp
Text conflict in storage/ndb/src/ndbapi/Ndbif.cpp
Text conflict in storage/ndb/src/ndbapi/Ndbinit.cpp
Text conflict in storage/ndb/src/ndbapi/Ndblist.cpp
Text conflict in storage/ndb/src/ndbapi/ObjectMap.cpp
Text conflict in storage/ndb/src/ndbapi/ObjectMap.hpp
Text conflict in storage/ndb/src/ndbapi/SignalSender.cpp
Text conflict in storage/ndb/src/ndbapi/SignalSender.hpp
Text conflict in storage/ndb/src/ndbapi/TransporterFacade.cpp
Text conflict in storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
Text conflict in storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
Text conflict in storage/ndb/src/ndbapi/ndberror.c
Text conflict in storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp
Text conflict in storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp
Text conflict in storage/ndb/test/include/AtrtClient.hpp
Text conflict in storage/ndb/test/include/CpcClient.hpp
Text conflict in storage/ndb/test/include/DbUtil.hpp
Text conflict in storage/ndb/test/include/HugoAsynchTransactions.hpp
Text conflict in storage/ndb/test/include/HugoCalculator.hpp
Text conflict in storage/ndb/test/include/HugoOperations.hpp
Text conflict in storage/ndb/test/include/HugoTransactions.hpp
Text conflict in storage/ndb/test/include/NDBT.hpp
Text conflict in storage/ndb/test/include/NDBT_DataSet.hpp
Text conflict in storage/ndb/test/include/NDBT_DataSetTransaction.hpp
Text conflict in storage/ndb/test/include/NDBT_Error.hpp
Text conflict in storage/ndb/test/include/NDBT_Output.hpp
Text conflict in storage/ndb/test/include/NDBT_ResultRow.hpp
Text conflict in storage/ndb/test/include/NDBT_ReturnCodes.h
Text conflict in storage/ndb/test/include/NDBT_Stats.hpp
Text conflict in storage/ndb/test/include/NDBT_Table.hpp
Text conflict in storage/ndb/test/include/NDBT_Tables.hpp
Text conflict in storage/ndb/test/include/NDBT_Test.hpp
Text conflict in storage/ndb/test/include/NDBT_Thread.hpp
Text conflict in storage/ndb/test/include/NdbBackup.hpp
Text conflict in storage/ndb/test/include/NdbConfig.hpp
Text conflict in storage/ndb/test/include/NdbGrep.hpp
Text conflict in storage/ndb/test/include/NdbMixRestarter.hpp
Text conflict in storage/ndb/test/include/NdbRestarter.hpp
Text conflict in storage/ndb/test/include/NdbRestarts.hpp
Text conflict in storage/ndb/test/include/NdbSchemaCon.hpp
Text conflict in storage/ndb/test/include/NdbSchemaOp.hpp
Text conflict in storage/ndb/test/include/NdbTest.hpp
Text conflict in storage/ndb/test/include/NdbTimer.hpp
Text conflict in storage/ndb/test/include/TestNdbEventOperation.hpp
Text conflict in storage/ndb/test/include/UtilTransactions.hpp
Text conflict in storage/ndb/test/include/getarg.h
Text conflict in storage/ndb/test/ndbapi/InsertRecs.cpp
Text conflict in storage/ndb/test/ndbapi/ScanFilter.hpp
Text conflict in storage/ndb/test/ndbapi/ScanFunctions.hpp
Text conflict in storage/ndb/test/ndbapi/ScanInterpretTest.hpp
Text conflict in storage/ndb/test/ndbapi/TraceNdbApi.cpp
Text conflict in storage/ndb/test/ndbapi/VerifyNdbApi.cpp
Text conflict in storage/ndb/test/ndbapi/acid.cpp
Text conflict in storage/ndb/test/ndbapi/acid2.cpp
Text conflict in storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp
Text conflict in storage/ndb/test/ndbapi/adoInsertRecs.cpp
Text conflict in storage/ndb/test/ndbapi/asyncGenerator.cpp
Text conflict in storage/ndb/test/ndbapi/bank/Bank.cpp
Text conflict in storage/ndb/test/ndbapi/bank/Bank.hpp
Text conflict in storage/ndb/test/ndbapi/bank/BankLoad.cpp
Text conflict in storage/ndb/test/ndbapi/bank/bankCreator.cpp
Text conflict in storage/ndb/test/ndbapi/bank/bankMakeGL.cpp
Text conflict in storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp
Text conflict in storage/ndb/test/ndbapi/bank/bankTimer.cpp
Text conflict in storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp
Text conflict in storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp
Text conflict in storage/ndb/test/ndbapi/bank/testBank.cpp
Text conflict in storage/ndb/test/ndbapi/bench/asyncGenerator.cpp
Text conflict in storage/ndb/test/ndbapi/bench/dbGenerator.h
Text conflict in storage/ndb/test/ndbapi/bench/dbPopulate.cpp
Text conflict in storage/ndb/test/ndbapi/bench/dbPopulate.h
Text conflict in storage/ndb/test/ndbapi/bench/macros.h
Text conflict in storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
Text conflict in storage/ndb/test/ndbapi/bench/mainPopulate.cpp
Text conflict in storage/ndb/test/ndbapi/bench/ndb_async1.cpp
Text conflict in storage/ndb/test/ndbapi/bench/ndb_async2.cpp
Text conflict in storage/ndb/test/ndbapi/bench/ndb_error.hpp
Text conflict in storage/ndb/test/ndbapi/bench/ndb_schema.hpp
Text conflict in storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp
Text conflict in storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp
Text conflict in storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp
Text conflict in storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp
Text conflict in storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp
Text conflict in storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp
Text conflict in storage/ndb/test/ndbapi/bench/testData.h
Text conflict in storage/ndb/test/ndbapi/bench/testDefinitions.h
Text conflict in storage/ndb/test/ndbapi/bench/userInterface.cpp
Text conflict in storage/ndb/test/ndbapi/bench/userInterface.h
Text conflict in storage/ndb/test/ndbapi/benchronja.cpp
Text conflict in storage/ndb/test/ndbapi/bulk_copy.cpp
Text conflict in storage/ndb/test/ndbapi/cdrserver.cpp
Text conflict in storage/ndb/test/ndbapi/celloDb.cpp
Text conflict in storage/ndb/test/ndbapi/create_all_tabs.cpp
Text conflict in storage/ndb/test/ndbapi/create_tab.cpp
Text conflict in storage/ndb/test/ndbapi/drop_all_tabs.cpp
Text conflict in storage/ndb/test/ndbapi/flexAsynch.cpp
Text conflict in storage/ndb/test/ndbapi/flexBench.cpp
Text conflict in storage/ndb/test/ndbapi/flexHammer.cpp
Text conflict in storage/ndb/test/ndbapi/flexScan.cpp
Text conflict in storage/ndb/test/ndbapi/flexTT.cpp
Text conflict in storage/ndb/test/ndbapi/flexTimedAsynch.cpp
Text conflict in storage/ndb/test/ndbapi/flex_bench_mysql.cpp
Text conflict in storage/ndb/test/ndbapi/index.cpp
Text conflict in storage/ndb/test/ndbapi/index2.cpp
Text conflict in storage/ndb/test/ndbapi/initronja.cpp
Text conflict in storage/ndb/test/ndbapi/interpreterInTup.cpp
Text conflict in storage/ndb/test/ndbapi/mainAsyncGenerator.cpp
Text conflict in storage/ndb/test/ndbapi/msa.cpp
Text conflict in storage/ndb/test/ndbapi/ndb_async1.cpp
Text conflict in storage/ndb/test/ndbapi/ndb_async2.cpp
Text conflict in storage/ndb/test/ndbapi/ndb_user_populate.cpp
Text conflict in storage/ndb/test/ndbapi/ndb_user_transaction.cpp
Text conflict in storage/ndb/test/ndbapi/ndb_user_transaction2.cpp
Text conflict in storage/ndb/test/ndbapi/ndb_user_transaction3.cpp
Text conflict in storage/ndb/test/ndbapi/ndb_user_transaction4.cpp
Text conflict in storage/ndb/test/ndbapi/ndb_user_transaction5.cpp
Text conflict in storage/ndb/test/ndbapi/ndb_user_transaction6.cpp
Text conflict in storage/ndb/test/ndbapi/restarter.cpp
Text conflict in storage/ndb/test/ndbapi/restarter2.cpp
Text conflict in storage/ndb/test/ndbapi/restarts.cpp
Text conflict in storage/ndb/test/ndbapi/size.cpp
Text conflict in storage/ndb/test/ndbapi/testBackup.cpp
Text conflict in storage/ndb/test/ndbapi/testBasic.cpp
Text conflict in storage/ndb/test/ndbapi/testBasicAsynch.cpp
Text conflict in storage/ndb/test/ndbapi/testBlobs.cpp
Text conflict in storage/ndb/test/ndbapi/testDataBuffers.cpp
Text conflict in storage/ndb/test/ndbapi/testDeadlock.cpp
Text conflict in storage/ndb/test/ndbapi/testDict.cpp
Text conflict in storage/ndb/test/ndbapi/testGrepVerify.cpp
Text conflict in storage/ndb/test/ndbapi/testIndex.cpp
Text conflict in storage/ndb/test/ndbapi/testInterpreter.cpp
Text conflict in storage/ndb/test/ndbapi/testMgm.cpp
Text conflict in storage/ndb/test/ndbapi/testNDBT.cpp
Text conflict in storage/ndb/test/ndbapi/testNdbApi.cpp
Text conflict in storage/ndb/test/ndbapi/testNodeRestart.cpp
Text conflict in storage/ndb/test/ndbapi/testOIBasic.cpp
Text conflict in storage/ndb/test/ndbapi/testOperations.cpp
Text conflict in storage/ndb/test/ndbapi/testOrderedIndex.cpp
Text conflict in storage/ndb/test/ndbapi/testPartitioning.cpp
Text conflict in storage/ndb/test/ndbapi/testReadPerf.cpp
Text conflict in storage/ndb/test/ndbapi/testRestartGci.cpp
Text conflict in storage/ndb/test/ndbapi/testSRBank.cpp
Text conflict in storage/ndb/test/ndbapi/testScan.cpp
Text conflict in storage/ndb/test/ndbapi/testScanInterpreter.cpp
Text conflict in storage/ndb/test/ndbapi/testScanPerf.cpp
Text conflict in storage/ndb/test/ndbapi/testSystemRestart.cpp
Text conflict in storage/ndb/test/ndbapi/testTimeout.cpp
Text conflict in storage/ndb/test/ndbapi/testTransactions.cpp
Text conflict in storage/ndb/test/ndbapi/test_event.cpp
Text conflict in storage/ndb/test/ndbapi/userInterface.cpp
Text conflict in storage/ndb/test/ndbnet/test.run
Text conflict in storage/ndb/test/ndbnet/testError.run
Text conflict in storage/ndb/test/ndbnet/testMNF.run
Text conflict in storage/ndb/test/ndbnet/testNR.run
Text conflict in storage/ndb/test/ndbnet/testNR1.run
Text conflict in storage/ndb/test/ndbnet/testNR4.run
Text conflict in storage/ndb/test/ndbnet/testSRhang.run
Text conflict in storage/ndb/test/ndbnet/testTR295.run
Text conflict in storage/ndb/test/newtonapi/basic_test/basic/basic.cpp
Text conflict in storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp
Text conflict in storage/ndb/test/newtonapi/basic_test/common.cpp
Text conflict in storage/ndb/test/newtonapi/basic_test/common.hpp
Text conflict in storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp
Text conflict in storage/ndb/test/newtonapi/basic_test/too_basic.cpp
Text conflict in storage/ndb/test/newtonapi/perf_test/perf.cpp
Text conflict in storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp
Text conflict in storage/ndb/test/odbc/SQL99_test/SQL99_test.h
Text conflict in storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp
Text conflict in storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp
Text conflict in storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp
Text conflict in storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp
Text conflict in storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp
Text conflict in storage/ndb/test/odbc/client/SQLBindColTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLBindParameterTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLCancelTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp
Text conflict in storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
Text conflict in storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp
Text conflict in storage/ndb/test/odbc/client/SQLConnectTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLCopyDescTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLDescribeColTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLDisconnectTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLEndTranTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLErrorTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLExecDirectTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLExecuteTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLFetchTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLGetDataTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLGetInfoTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLParamDataTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLPrepareTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLPutDataTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLRowCountTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLTablesTest.cpp
Text conflict in storage/ndb/test/odbc/client/SQLTransactTest.cpp
Text conflict in storage/ndb/test/odbc/client/common.hpp
Text conflict in storage/ndb/test/odbc/client/main.cpp
Text conflict in storage/ndb/test/odbc/driver/testOdbcDriver.cpp
Text conflict in storage/ndb/test/odbc/test_compiler/test_compiler.cpp
Text conflict in storage/ndb/test/run-test/atrt-analyze-result.sh
Text conflict in storage/ndb/test/run-test/atrt-clear-result.sh
Text conflict in storage/ndb/test/run-test/atrt-gather-result.sh
Text conflict in storage/ndb/test/run-test/atrt-setup.sh
Text conflict in storage/ndb/test/run-test/atrt-testBackup
Text conflict in storage/ndb/test/run-test/atrt.hpp
Text conflict in storage/ndb/test/run-test/make-index.sh
Text conflict in storage/ndb/test/src/CpcClient.cpp
Text conflict in storage/ndb/test/src/DbUtil.cpp
Text conflict in storage/ndb/test/src/HugoAsynchTransactions.cpp
Text conflict in storage/ndb/test/src/HugoCalculator.cpp
Text conflict in storage/ndb/test/src/HugoOperations.cpp
Text conflict in storage/ndb/test/src/HugoTransactions.cpp
Text conflict in storage/ndb/test/src/NDBT_Error.cpp
Text conflict in storage/ndb/test/src/NDBT_Output.cpp
Text conflict in storage/ndb/test/src/NDBT_ResultRow.cpp
Text conflict in storage/ndb/test/src/NDBT_ReturnCodes.cpp
Text conflict in storage/ndb/test/src/NDBT_Table.cpp
Text conflict in storage/ndb/test/src/NDBT_Tables.cpp
Text conflict in storage/ndb/test/src/NDBT_Thread.cpp
Text conflict in storage/ndb/test/src/NdbBackup.cpp
Text conflict in storage/ndb/test/src/NdbConfig.cpp
Text conflict in storage/ndb/test/src/NdbGrep.cpp
Text conflict in storage/ndb/test/src/NdbMixRestarter.cpp
Text conflict in storage/ndb/test/src/NdbRestarter.cpp
Text conflict in storage/ndb/test/src/NdbRestarts.cpp
Text conflict in storage/ndb/test/src/NdbSchemaCon.cpp
Text conflict in storage/ndb/test/src/NdbSchemaOp.cpp
Text conflict in storage/ndb/test/src/UtilTransactions.cpp
Text conflict in storage/ndb/test/tools/copy_tab.cpp
Text conflict in storage/ndb/test/tools/cpcc.cpp
Text conflict in storage/ndb/test/tools/create_index.cpp
Text conflict in storage/ndb/test/tools/hugoCalculator.cpp
Text conflict in storage/ndb/test/tools/hugoFill.cpp
Text conflict in storage/ndb/test/tools/hugoLoad.cpp
Text conflict in storage/ndb/test/tools/hugoLockRecords.cpp
Text conflict in storage/ndb/test/tools/hugoPkDelete.cpp
Text conflict in storage/ndb/test/tools/hugoPkRead.cpp
Text conflict in storage/ndb/test/tools/hugoPkReadRecord.cpp
Text conflict in storage/ndb/test/tools/hugoPkUpdate.cpp
Text conflict in storage/ndb/test/tools/hugoScanRead.cpp
Text conflict in storage/ndb/test/tools/hugoScanUpdate.cpp
Text conflict in storage/ndb/test/tools/listen.cpp
Text conflict in storage/ndb/test/tools/rep_latency.cpp
Text conflict in storage/ndb/test/tools/restart.cpp
Text conflict in storage/ndb/test/tools/transproxy.cpp
Text conflict in storage/ndb/test/tools/verify_index.cpp
Text conflict in storage/ndb/tools/clean-links.sh
Text conflict in storage/ndb/tools/make-errors.pl
Text conflict in storage/ndb/tools/make-links.sh
Text conflict in storage/ndb/tools/ndb_error_reporter
Text conflict in storage/ndb/tools/ndb_test_platform.cpp
Text conflict in storage/ndb/tools/ndbsql.cpp
Text conflict in storage/ndb/tools/restore/Restore.cpp
Text conflict in storage/ndb/tools/restore/Restore.hpp
Text conflict in storage/ndb/tools/restore/consumer.cpp
Text conflict in storage/ndb/tools/restore/consumer.hpp
Text conflict in storage/ndb/tools/restore/consumer_printer.cpp
Text conflict in storage/ndb/tools/restore/consumer_printer.hpp
Text conflict in storage/ndb/tools/restore/consumer_restore.hpp
Text conflict in storage/ndb/tools/restore/consumer_restorem.cpp
Text conflict in storage/ndb/tools/restore/ndb_nodegroup_map.h
Text conflict in storage/ndb/tools/rgrep
To merge this branch: bzr merge lp:~sergei.glushchenko/percona-server/5.5-ps-bug1313696
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2014-04-29 Approve on 2014-05-15
Review via email: mp+217634@code.launchpad.net

This proposal supersedes a proposal from 2014-04-29.

Description of the change

To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

What are all those conflicts?

review: Needs Information

GCA for does not contain audit log plugin for 5.5 yet. It is criss cross merge.

Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-03-27 15:42:21 +0000
3+++ CMakeLists.txt 2014-05-14 14:34:53 +0000
4@@ -347,6 +347,7 @@
5 SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
6 ENDIF()
7
8+<<<<<<< TREE
9 SET(TMPDIR "P_tmpdir"
10 CACHE PATH
11 "PATH to MySQL TMP dir. Defaults to the P_tmpdir macro in <stdio.h>")
12@@ -357,6 +358,17 @@
13 # Quote it, to make it a const char string.
14 SET(DEFAULT_TMPDIR "\"${TMPDIR}\"")
15 ENDIF()
16+=======
17+OPTION(TMPDIR
18+"PATH to MySQL TMP dir. If unspecified, defaults to P_tmpdir in <stdio.h>" OFF)
19+IF(TMPDIR)
20+ # Quote it, to make it a const char string.
21+ SET(DEFAULT_TMPDIR "\"${TMPDIR}\"")
22+ELSE()
23+ # Do not quote it, to refer to the P_tmpdir macro in <stdio.h>.
24+ SET(DEFAULT_TMPDIR "P_tmpdir")
25+ENDIF()
26+>>>>>>> MERGE-SOURCE
27
28 # Run platform tests
29 INCLUDE(configure.cmake)
30
31=== added file 'Makefile-ps.OTHER'
32--- Makefile-ps.OTHER 1970-01-01 00:00:00 +0000
33+++ Makefile-ps.OTHER 2014-05-14 14:34:53 +0000
34@@ -0,0 +1,58 @@
35+MYSQL_VERSION=5.5.36
36+PERCONA_SERVER_VERSION=rel34.2
37+PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
38+PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
39+PERCONA_SERVER_SHORT_2 ?=Percona-Server
40+DEBUG_DIR ?= $(PERCONA_SERVER)-debug
41+RELEASE_DIR ?= $(PERCONA_SERVER)-release
42+SERIES ?=series
43+
44+CFLAGS ?=-fPIC -Wall -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
45+CXXFLAGS ?=-fno-exceptions -fPIC -Wall -Wno-unused-parameter -fno-implicit-templates -fno-exceptions -fno-rtti -O3 -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing
46+
47+CFLAGS_RELEASE=$(CFLAGS) -DDBUG_OFF -DMY_PTHREAD_FASTMUTEX=1
48+CXXFLAGS_RELEASE=$(CXXFLAGS) -DDBUG_OFF -DMY_PTHREAD_FASTMUTEX=1
49+
50+CMAKE=CC=gcc CXX=g++ cmake $(ADDITIONAL)
51+ADDITIONAL ?=
52+CONFIGURE=CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2" CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2" LIBS=-lrt ./configure --prefix=/usr/local/$(PERCONA_SERVER)-$(MYSQL_VERSION) --with-plugin-innobase --with-plugin-partition
53+
54+REVS = $(shell bzr log | grep rev | head -1 )
55+REV = $(word 2, $(REVS) )
56+
57+all: maatkit-udf
58+ @echo ""
59+ @echo "Percona Server source code is ready"
60+ @echo "Now change directory to $(PERCONA_SERVER) define variables as show below"
61+ @echo ""
62+ @echo export CFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
63+ @echo export CXXFLAGS="-O2 -g -fmessage-length=0 -D_FORTIFY_SOURCE=2"
64+ @echo export LIBS=-lrt
65+ @echo ""
66+ @echo "and run cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_CONFIG=mysql_release -DFEATURE_SET=community -DWITH_EMBEDDED_SERVER=OFF && make all install"
67+ @echo ""
68+
69+maatkit-udf:
70+ cd UDF && autoreconf --install
71+
72+configure: all
73+ (bash BUILD/autorun.sh; $(CONFIGURE))
74+
75+cmake: cmake_release cmake_debug
76+
77+cmake_release:
78+ rm -rf $(RELEASE_DIR)
79+ (mkdir -p $(RELEASE_DIR); cd $(RELEASE_DIR); CFLAGS="$(CFLAGS_RELEASE)" CXXFLAGS="$(CXXFLAGS_RELEASE)" $(CMAKE) -G "Unix Makefiles" ../$(PERCONA_SERVER))
80+
81+cmake_debug:
82+ rm -rf $(DEBUG_DIR)
83+ (mkdir -p $(DEBUG_DIR); cd $(DEBUG_DIR); CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(CMAKE) -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DWITH_DEBUG=ON -DMYSQL_MAINTAINER_MODE=OFF ../$(PERCONA_SERVER))
84+
85+binary:
86+ (CFLAGS="$(CFLAGS_RELEASE)" CXXFLAGS="$(CXXFLAGS_RELEASE)" ${CMAKE} . -DBUILD_CONFIG=mysql_release \
87+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
88+ -DCMAKE_INSTALL_PREFIX="/usr/local/$(PERCONA_SERVER)-$(MYSQL_VERSION)-$(REV)" \
89+ -DFEATURE_SET="community" \
90+ -DWITH_EMBEDDED_SERVER=OFF \
91+ -DCOMPILATION_COMMENT="Percona-Server" \
92+ -DMYSQL_SERVER_SUFFIX="-$(REV)" )
93
94=== modified file 'UDF/configure.ac'
95--- UDF/configure.ac 2014-03-12 22:21:56 +0000
96+++ UDF/configure.ac 2014-05-14 14:34:53 +0000
97@@ -1,6 +1,12 @@
98+<<<<<<< TREE
99 AC_INIT([pt-udf], [0.1], [https://bugs.launchpad.net/percona-toolkit])
100 AM_INIT_AUTOMAKE([foreign -Wall -Wno-extra-portability foreign])
101 AC_CONFIG_MACRO_DIR([m4])
102+=======
103+AC_INIT([maatkit-udf], [0.1], [http://code.google.com/p/maatkit/issues/list])
104+AM_INIT_AUTOMAKE([foreign -Wall -Wno-extra-portability foreign])
105+AC_CONFIG_MACRO_DIR([m4])
106+>>>>>>> MERGE-SOURCE
107 LT INIT
108 AC_PROG_LIBTOOL
109 AC_PROG_CC
110
111=== modified file 'VERSION'
112--- VERSION 2014-03-27 15:42:21 +0000
113+++ VERSION 2014-05-14 14:34:53 +0000
114@@ -1,4 +1,9 @@
115 MYSQL_VERSION_MAJOR=5
116 MYSQL_VERSION_MINOR=5
117+<<<<<<< TREE
118 MYSQL_VERSION_PATCH=37
119 MYSQL_VERSION_EXTRA=-35.0
120+=======
121+MYSQL_VERSION_PATCH=36
122+MYSQL_VERSION_EXTRA=-34.2
123+>>>>>>> MERGE-SOURCE
124
125=== modified file 'build-ps/build-binary.sh'
126--- build-ps/build-binary.sh 2014-04-18 04:06:52 +0000
127+++ build-ps/build-binary.sh 2014-05-14 14:34:53 +0000
128@@ -127,7 +127,11 @@
129 WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
130
131 SOURCEDIR="$(cd $(dirname "$0"); cd ..; pwd)"
132+<<<<<<< TREE
133 test -e "$SOURCEDIR/VERSION" || exit 2
134+=======
135+test -e "$SOURCEDIR/Makefile-ps" || exit 2
136+>>>>>>> MERGE-SOURCE
137
138 # The number of processors is a good default for -j
139 if test -e "/proc/cpuinfo"
140@@ -137,10 +141,18 @@
141 PROCESSORS=2
142 fi
143
144+<<<<<<< TREE
145 # Extract version from the VERSION file
146 source "$SOURCEDIR/VERSION"
147 MYSQL_VERSION="$MYSQL_VERSION_MAJOR.$MYSQL_VERSION_MINOR.$MYSQL_VERSION_PATCH"
148 PERCONA_SERVER_VERSION="$(echo $MYSQL_VERSION_EXTRA | sed 's/^-/rel/')"
149+=======
150+# Extract version from the Makefile-ps
151+MYSQL_VERSION="$(grep ^MYSQL_VERSION= "$SOURCEDIR/Makefile-ps" \
152+ | cut -d = -f 2)"
153+PERCONA_SERVER_VERSION="$(grep ^PERCONA_SERVER_VERSION= \
154+ "$SOURCEDIR/Makefile-ps" | cut -d = -f 2)"
155+>>>>>>> MERGE-SOURCE
156 PRODUCT="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
157
158 # Build information
159@@ -152,6 +164,7 @@
160
161 # Compilation flags
162 export CC=${CC:-gcc}
163+<<<<<<< TREE
164 export CXX=${CXX:-g++}
165
166 #
167@@ -162,6 +175,19 @@
168 export CFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
169 export CXXFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
170 #
171+=======
172+export CXX=${CXX:-g++}
173+#
174+if [ -n "$(which rpm)" ]; then
175+ export COMMON_FLAGS=$(rpm --eval %optflags | sed -e "s|march=i386|march=i686|g")
176+else
177+ export COMMON_FLAGS="-O2 -g"
178+fi
179+#
180+export CFLAGS="${COMMON_FLAGS} -static-libgcc -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
181+export CXXFLAGS="${COMMON_FLAGS} -DPERCONA_INNODB_VERSION=$PERCONA_SERVER_VERSION"
182+#
183+>>>>>>> MERGE-SOURCE
184 export MAKE_JFLAG="${MAKE_JFLAG:--j$PROCESSORS}"
185 #
186 # Create a temporary working directory
187@@ -185,6 +211,12 @@
188 (
189 cd "$SOURCEDIR"
190
191+<<<<<<< TREE
192+=======
193+ # Execute clean and download mysql, apply patches
194+ make -f Makefile-ps all
195+
196+>>>>>>> MERGE-SOURCE
197 cmake . ${CMAKE_OPTS:-} -DBUILD_CONFIG=mysql_release \
198 -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" \
199 -DWITH_EMBEDDED_SERVER=OFF \
200@@ -217,8 +249,12 @@
201 # Build UDF
202 (
203 cd "UDF"
204+<<<<<<< TREE
205 autoreconf --install
206 CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/include" \
207+=======
208+ CXX=${UDF_CXX:-g++} ./configure --includedir="$SOURCEDIR/include" \
209+>>>>>>> MERGE-SOURCE
210 --libdir="/usr/local/$PRODUCT_FULL/mysql/plugin"
211 make $MAKE_JFLAG
212 make DESTDIR="$INSTALLDIR" install
213
214=== modified file 'build-ps/debian/control'
215--- build-ps/debian/control 2014-05-05 09:04:25 +0000
216+++ build-ps/debian/control 2014-05-14 14:34:53 +0000
217@@ -43,6 +43,7 @@
218 .
219 This package includes the client library.
220
221+<<<<<<< TREE
222 Package: libperconaserverclient18-dev
223 Architecture: any
224 Section: libdevel
225@@ -66,6 +67,41 @@
226 libmysqlclient-dev,
227 libmysqlclient18-dev,
228 libmariadbclient-dev
229+=======
230+Package: libperconaserverclient18-dev
231+Architecture: any
232+Section: libdevel
233+Depends: libperconaserverclient-dev (= ${binary:Version}), ${misc:Depends}
234+Description: Percona Server database development files - empty transitional
235+ package. This is an empty package that depends on libperconaserverclient-dev
236+ to ease the transition for packages with versioned build-deps on
237+ libperconaserverclient18-dev.
238+
239+Package: libperconaserverclient-dev
240+Architecture: any
241+Section: libdevel
242+Depends: libperconaserverclient18 (= ${binary:Version}),
243+ zlib1g-dev,
244+ ${misc:Depends}
245+Breaks: libperconaserverclient16-dev,
246+ libperconaserverclient15-dev,
247+ libperconaserverclient14-dev,
248+ libperconaserverclient12-dev,
249+ libperconaserverclient10-dev,
250+ libpercona-xtradb-client-dev,
251+ libmysqlclient-dev,
252+ libmysqlclient18-dev,
253+ libmariadbclient-dev
254+Replaces: libperconaserverclient16-dev,
255+ libperconaserverclient15-dev,
256+ libperconaserverclient14-dev,
257+ libperconaserverclient12-dev,
258+ libperconaserverclient10-dev,
259+ libpercona-xtradb-client-dev,
260+ libmysqlclient-dev,
261+ libmysqlclient18-dev,
262+ libmariadbclient-dev
263+>>>>>>> MERGE-SOURCE
264 Provides: libmysqlclient-dev
265 Description: Percona Server database development files
266 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
267@@ -90,6 +126,7 @@
268
269 Package: percona-server-client-5.5
270 Architecture: any
271+<<<<<<< TREE
272 Depends: debianutils (>=1.6),
273 libdbi-perl,
274 percona-server-common-5.5 (>= ${source:Version}),
275@@ -121,6 +158,33 @@
276 mariadb-client-5.5,
277 virtual-mysql-client,
278 virtual-mysql-client-core
279+=======
280+Depends: debianutils (>=1.6),
281+ libdbi-perl,
282+ percona-server-common-5.5 (>= ${source:Version}),
283+ libperconaserverclient18 (>= ${source:Version}),
284+ ${shlibs:Depends},
285+ ${misc:Depends}
286+Provides: virtual-mysql-client
287+Breaks: mysql-client-5.0,
288+ mysql-client-core-5.1,
289+ mysql-client-5.1,
290+ mysql-client-5.5,
291+ percona-xtradb-client-5.0,
292+ percona-server-client-5.1,
293+ mariadb-client,
294+ mariadb-client-core-5.5,
295+ mariadb-client-5.5
296+Replaces: mysql-client-5.0,
297+ mysql-client-core-5.1,
298+ mysql-client-5.1,
299+ mysql-client-5.5,
300+ percona-xtradb-client-5.0,
301+ percona-server-client-5.1,
302+ mariadb-client,
303+ mariadb-client-core-5.5,
304+ mariadb-client-5.5
305+>>>>>>> MERGE-SOURCE
306 Description: Percona Server database client binaries
307 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
308 database server. SQL (Structured Query Language) is the most popular database
309@@ -133,6 +197,7 @@
310 Package: percona-server-server-5.5
311 Architecture: any
312 Suggests: tinyca
313+<<<<<<< TREE
314 Pre-Depends: percona-server-common-5.5 (>= ${source:Version}),
315 adduser (>= 3.4.0),
316 debconf
317@@ -170,6 +235,39 @@
318 mariadb-server-5.5,
319 virtual-mysql-server,
320 virtual-mysql-server-core
321+=======
322+Pre-Depends: percona-server-common-5.5 (>= ${source:Version}),
323+ adduser (>= 3.4.0),
324+ debconf
325+Depends: percona-server-client-5.5 (>= ${source:Version}),
326+ libdbi-perl,
327+ libdbd-mysql-perl,
328+ perl (>= 5.6),
329+ ${shlibs:Depends},
330+ ${misc:Depends},
331+ psmisc,
332+ passwd,
333+ lsb-base (>= 3.0-10)
334+Provides: virtual-mysql-server
335+Breaks: mysql-server-5.0,
336+ mysql-server-5.1,
337+ mysql-server-5.5,
338+ mysql-server-core-5.1,
339+ percona-xtradb-server-5.0,
340+ percona-server-server-5.1,
341+ mariadb-server,
342+ mariadb-server-core-5.5,
343+ mariadb-server-5.5
344+Replaces: mysql-server-5.0,
345+ mysql-server-5.1,
346+ mysql-server-5.5,
347+ mysql-server-core-5.1,
348+ percona-xtradb-server-5.0,
349+ percona-server-server-5.1,
350+ mariadb-server,
351+ mariadb-server-core-5.5,
352+ mariadb-server-5.5
353+>>>>>>> MERGE-SOURCE
354 Description: Percona Server database server binaries
355 Percona Server is a fast, stable and true multi-user, multi-threaded SQL
356 database server. SQL (Structured Query Language) is the most popular database
357@@ -220,6 +318,7 @@
358 a means for verifying that Percona Server and its client programs
359 operate according to expectations
360
361+<<<<<<< TREE
362 Package: percona-server-source-5.5
363 Architecture: any
364 Depends: ${misc:Depends}, ${shlibs:Depends}
365@@ -228,13 +327,11 @@
366 building.
367
368 Package: percona-server-5.5-dbg
369+=======
370+Package: percona-server-source-5.5
371+>>>>>>> MERGE-SOURCE
372 Architecture: any
373-Section: debug
374-Depends: percona-server-server-5.5 (= ${binary:Version}), ${misc:Depends}
375-Description: Debugging package for Percona Server
376- Percona Server is a fast, stable and true multi-user, multi-threaded SQL
377- database server. SQL (Structured Query Language) is the most popular database
378- query language in the world. The main goals of Percona Server are speed,
379- robustness and ease of use.
380- .
381- This package contains the debugging symbols for the Percona Server binaries.
382+Depends: ${misc:Depends}, ${shlibs:Depends}
383+Description: Percona Server 5.5 source
384+ This package includes the source code to Percona Server as configured before
385+ building.
386
387=== renamed file 'build-ps/debian/libperconaserverclient18-dev.files' => 'build-ps/debian/libperconaserverclient-dev.files'
388=== modified file 'build-ps/debian/rules'
389--- build-ps/debian/rules 2014-03-31 05:35:44 +0000
390+++ build-ps/debian/rules 2014-05-14 14:34:53 +0000
391@@ -118,6 +118,7 @@
392 clean: clean-patched
393 rm -rf debian/patched
394 clean-patched:
395+<<<<<<< TREE
396 @echo "RULES.clean-patched"
397 dh_testdir
398 dh_testroot
399@@ -289,6 +290,179 @@
400 dh_builddeb -a
401
402 binary: binary-indep binary-arch
403+=======
404+ @echo "RULES.clean-patched"
405+ dh_testdir
406+ dh_testroot
407+ rm -f configure-stamp*
408+ rm -f build-stamp*
409+ rm -f testsuite-stamp
410+
411+ [ ! -f Makefile ] || $(MAKE) clean
412+ [ ! -d mysql-test/var ] || rm -rf mysql-test/var
413+
414+ rm -rf $(builddir)
415+
416+ debconf-updatepo
417+ rm -f $(EXPORTED_SOURCE_TARBALL)
418+ dh_clean -v
419+
420+
421+install: build
422+ @echo "RULES.$@"
423+ dh_testdir
424+ dh_testroot
425+ dh_prep
426+ dh_installdirs
427+
428+ # make install (trailing slash needed for innobase)
429+ (cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/)
430+
431+ # build HandlerSocket
432+ (cd storage/HandlerSocket-Plugin-for-MySQL && \
433+ MYSQL_CFLAGS="-I$(CURDIR)/$(builddir)/include" \
434+ ./configure --with-mysql-source=$(CURDIR) \
435+ --with-mysql-bindir=$(CURDIR)/$(builddir)/scripts \
436+ --with-mysql-plugindir=$(prefix)/lib/mysql/plugin \
437+ --libdir=$(prefix)/lib --prefix=$(prefix) && \
438+ make && make DESTDIR=$(TMP) install)
439+
440+ # Build UDFs
441+ (cd UDF && \
442+ CXXFLAGS="-I $(CURDIR)/$(builddir)/include" \
443+ ./configure --includedir=$(CURDIR)/include \
444+ --libdir=$(prefix)/lib/mysql/plugin && \
445+ make && make DESTDIR=$(TMP) install)
446+
447+ # After installing, remove rpath to make lintian happy.
448+ set +e; \
449+ find ./debian/tmp/ -type f -print0 \
450+ | xargs -0 --no-run-if-empty chrpath -k 2>/dev/null \
451+ | fgrep RPATH= \
452+ | cut -d: -f 1 \
453+ | xargs --no-run-if-empty chrpath -d; \
454+ set -e
455+
456+ # libperconaserverclient: move shared libraries (but not the rest like libheap.a & co)
457+ # libmysqlclient_r is now a symlink to libmysqlclient. But it is
458+ # created wrong by the cmake build system and points at
459+ # libmysqlclient.so instead of the corresponding versioned lib.
460+ for i in `ls $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libperconaserverclient.so*` ; do \
461+ rlib=`basename $$i | sed -e 's/libperconaserverclient\./libperconaserverclient_r./'` ;\
462+ ln -sf `basename $$i` $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/$$rlib ;\
463+ done
464+
465+ # libmysqlclient-dev: forgotten header file since 3.23.25?
466+ #cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/
467+ #cp include/my_dir.h $(TMP)/usr/include/mysql/
468+ # install libmysqld built with -FPIC
469+ install -d -m 0755 -o root -g root $(TMP)/usr/lib/percona-server
470+ #install -m 0644 -o root -g root $(BUILDDIR_PIC)/libmysqld/libmysqld.a $(TMP)/usr/lib/mysql/libmysqld_pic.a
471+ # mysql_config won't report the -fPIC, so give libmysqld-pic users a way to get their flags
472+ #install -m 0755 -o root -g root $(BUILDDIR_PIC)/scripts/mysql_config $(TMP)/usr/bin/mysql_config_pic
473+
474+ # mysql-common: We now provide our own config file.
475+ install -d $(TMP)/etc/mysql
476+ #install -m 0644 debian/additions/my.cnf $(TMP)/etc/mysql/my.cnf
477+
478+ # mysql-client
479+ #FIXME install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
480+ #FIXME install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
481+ #FIXME install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/
482+
483+ # mysql-5.5-testsuite
484+ mkdir -p $(TMP)/usr/lib/percona-server-testsuite
485+ cp -rp $(TMP)/usr/share/mysql-test/* $(TMP)/usr/lib/percona-server-testsuite
486+
487+ # mysql-server
488+ mkdir -p $(TMP)/usr/share/doc/percona-server-5.5/examples
489+ mv $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/percona-server-5.5/examples/
490+ rm -vf $(TMP)/usr/share/mysql/mi_test_all* \
491+ $(TMP)/usr/share/mysql/mysql-log-rotate \
492+ $(TMP)/usr/share/mysql/mysql.server \
493+ $(TMP)/usr/share/mysql/binary-configure
494+ nm -n $(builddir)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/percona-server-5.5/mysqld.sym.gz
495+ # FIXME install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
496+ install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
497+ install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
498+
499+ # install AppArmor profile
500+ # FIXME install -D -m 644 debian/apparmor-profile $(TMP)/etc/apparmor.d/usr.sbin.mysqld
501+ # install Apport hook
502+ # FIXME install -D -m 644 debian/mysql-server-5.5.py $(TMP)/usr/share/apport/package-hooks/source_mysql-5.5.py
503+
504+ install -D -m 0644 $(EXPORTED_SOURCE_TARBALL) $(TMP)/usr/src/percona-server/`basename $(EXPORTED_SOURCE_TARBALL)`
505+
506+ # Work around MySQL bug 71113, x bit set on example configs
507+ chmod -x $(TMP)/usr/share/mysql/config.medium.ini
508+ chmod -x $(TMP)/usr/share/mysql/ndb-config-2-node.ini
509+ chmod -x $(TMP)/usr/share/mysql/config.huge.ini
510+ chmod -x $(TMP)/usr/share/mysql/config.small.ini
511+
512+ dh_movefiles
513+
514+# Build architecture-independent files here.
515+binary-indep: build install
516+ @echo "RULES.binary-indep"
517+ dh_testdir -i
518+ dh_testroot -i
519+ dh_installdebconf -i
520+ dh_installdocs -i
521+ dh_installexamples -i
522+ dh_installmenu -i
523+ dh_installlogrotate -i
524+ dh_installinit -i
525+ dh_installcron -i
526+ dh_installman -i
527+ dh_installinfo -i
528+ dh_installlogcheck -i
529+ dh_installchangelogs -i
530+ dh_link -i
531+ dh_compress -i
532+ dh_fixperms -i
533+ dh_installdeb -i
534+ dh_perl -i
535+ dh_gencontrol -i
536+ dh_md5sums -i
537+ dh_builddeb -i
538+
539+binary-arch: build install
540+ @echo "RULES.binary-arch"
541+ dh_testdir
542+ dh_testroot
543+
544+ dh_installdebconf -a
545+ dh_installdocs -a
546+ dh_installexamples -a
547+ dh_installmenu -a
548+ dh_installlogrotate -a --name mysql-server
549+ if [ "$(DISTRIBUTION)" = "Ubuntu" ]; then if [ "$(DISTRELEASE)" != "lucid"]; then dh_apparmor -pmysql-server-5.5 --profile-name=usr.sbin.mysqld; fi; fi
550+ # Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
551+ # started which might depend on a running database server.
552+ dh_installinit -a --name=mysql -- defaults 19 21
553+ dh_installcron -a --name mysql-server
554+ dh_installman -a
555+ dh_installinfo -a
556+ dh_installlogcheck -a
557+ dh_installchangelogs -a
558+ dh_strip -a
559+ dh_lintian
560+ dh_link -a # .so muss nach .so.1.2.3 installier werden!
561+ dh_compress -a
562+ dh_fixperms -a
563+ #dh_makeshlibs -a
564+ dh_makeshlibs -plibmysqlclient18 -V'libmysqlclient18 (>= 5.5.13-1)'
565+ dh_installdeb -a
566+ dh_perl -a
567+ #dh_shlibdeps -a -l debian/libmysqlclient16/usr/lib -L libmysqlclient16
568+ dh_makeshlibs -a
569+ dh_shlibdeps -a
570+ dh_gencontrol -a
571+ dh_md5sums -a
572+ dh_builddeb -a
573+
574+binary: binary-indep binary-arch
575+>>>>>>> MERGE-SOURCE
576
577 override_dh_auto_install:
578 dh_auto_install
579
580=== modified file 'build-ps/percona-server.spec'
581=== modified file 'cmake/mysql_version.cmake'
582=== modified file 'doc/source/conf.py'
583--- doc/source/conf.py 2014-04-30 09:32:01 +0000
584+++ doc/source/conf.py 2014-05-14 14:34:53 +0000
585@@ -54,7 +54,11 @@
586 # The short X.Y version.
587 version = '5.5'
588 # The full version, including alpha/beta/rc tags.
589+<<<<<<< TREE
590 release = '5.5.37-35.0'
591+=======
592+release = '5.5.36-34.2'
593+>>>>>>> MERGE-SOURCE
594
595 # The language for content autogenerated by Sphinx. Refer to documentation
596 # for a list of supported languages.
597
598=== modified file 'doc/source/index.rst'
599=== modified file 'doc/source/installation/apt_repo.rst'
600--- doc/source/installation/apt_repo.rst 2014-04-30 09:32:01 +0000
601+++ doc/source/installation/apt_repo.rst 2014-05-14 14:34:53 +0000
602@@ -43,8 +43,12 @@
603 * 10.04LTS (lucid)
604 * 12.04LTS (precise)
605 * 13.04 (raring)
606+<<<<<<< TREE
607 * 13.10 (saucy)
608 * 14.04LTS (trusty)
609+=======
610+ * 13.10 (saucy)
611+>>>>>>> MERGE-SOURCE
612
613 Percona `apt` Experimental repository
614 =====================================
615
616=== modified file 'doc/source/release-notes/release-notes_index.rst'
617--- doc/source/release-notes/release-notes_index.rst 2014-04-30 09:32:01 +0000
618+++ doc/source/release-notes/release-notes_index.rst 2014-05-14 14:34:53 +0000
619@@ -6,11 +6,18 @@
620 :maxdepth: 1
621 :glob:
622
623+<<<<<<< TREE
624 Percona-Server-5.5.37-35.0
625 Percona-Server-5.5.36-34.2
626 Percona-Server-5.5.36-34.1
627 Percona-Server-5.5.36-34.0
628 Percona-Server-5.5.35-33.0
629+=======
630+ Percona-Server-5.5.36-34.2
631+ Percona-Server-5.5.36-34.1
632+ Percona-Server-5.5.36-34.0
633+ Percona-Server-5.5.35-33.0
634+>>>>>>> MERGE-SOURCE
635 Percona-Server-5.5.34-32.0
636 Percona-Server-5.5.33-31.1
637 Percona-Server-5.5.32-31.0
638
639=== modified file 'doc/source/upstream-bug-fixes.rst'
640--- doc/source/upstream-bug-fixes.rst 2014-04-30 09:32:01 +0000
641+++ doc/source/upstream-bug-fixes.rst 2014-05-14 14:34:53 +0000
642@@ -5,6 +5,7 @@
643 =============================================================
644
645 +-------------------------------------------------------------------------------------------------------------+
646+<<<<<<< TREE
647 |:Upstream bug: :mysqlbug:`60782` - Audit plugin API: no MYSQL_AUDIT_GENERAL_LOG notifications with general...|
648 |:Launchpad bug: :bug:`1182535` |
649 |:Upstream state: Verified (checked on 2014-04-29) |
650@@ -59,9 +60,51 @@
651 |:Fix Released: :rn:`5.5.35-33.0` |
652 |:Upstream fix: N/A |
653 +-------------------------------------------------------------------------------------------------------------+
654+=======
655+|:Upstream bug: :mysqlbug:`71375` - Slave IO thread won't attempt auto reconnect to the master/error-code 1593|
656+|:Launchpad bug: :bug:`1268735` |
657+|:Upstream state: Verified (checked on 2014-03-17) |
658+|:Fix Released: :rn:`5.5.36-34.1` |
659+|:Upstream fix: N/A |
660++-------------------------------------------------------------------------------------------------------------+
661+|:Upstream bug: :mysqlbug:`71374` - Slave IO thread won't attempt auto reconnect to the master/error-code 1159|
662+|:Launchpad bug: :bug:`1268729` |
663+|:Upstream state: Verified (checked on 2014-03-17) |
664+|:Fix Released: :rn:`5.5.36-34.1` |
665+|:Upstream fix: N/A |
666++-------------------------------------------------------------------------------------------------------------+
667+|:Upstream bug: :mysqlbug:`71089` - CMake warning when generating Makefile |
668+|:Launchpad bug: :bug:`1274827` |
669+|:Upstream state: Closed |
670+|:Fix Released: :rn:`5.5.36-34.0` |
671+|:Upstream fix: N/A |
672++-------------------------------------------------------------------------------------------------------------+
673+|:Upstream bug: :mysqlbug:`54430` - innodb should retry partial reads/writes where errno was 0 |
674+|:Launchpad bug: :bug:`1262500` |
675+|:Upstream state: Closed |
676+|:Fix Released: :rn:`5.5.36-34.0` |
677+|:Upstream fix: N/A |
678++-------------------------------------------------------------------------------------------------------------+
679+|:Upstream bug: :mysqlbug:`62311` - segfault in mysqld during early SIGHUP handling |
680+|:Launchpad bug: :bug:`1249193` |
681+|:Upstream state: Closed |
682+|:Fix Released: :rn:`5.5.36-34.0` |
683+|:Upstream fix: N/A |
684++-------------------------------------------------------------------------------------------------------------+
685+|:Upstream bug: :mysqlbug:`41975` - Support for SSL options not included in mysqlbinlog |
686+|:Launchpad bug: :bug:`1197524` |
687+|:Upstream state: Closed |
688+|:Fix Released: :rn:`5.5.35-33.0` |
689+|:Upstream fix: N/A |
690++-------------------------------------------------------------------------------------------------------------+
691+>>>>>>> MERGE-SOURCE
692 |:Upstream bug: :mysqlbug:`69639` - mysql failed to build with dtrace Sun D 1.11 |
693 |:Launchpad bug: :bug:`1196460` |
694+<<<<<<< TREE
695 |:Upstream state: Open (checked on 2014-04-29) |
696+=======
697+|:Upstream state: Open (checked on 2014-03-17) |
698+>>>>>>> MERGE-SOURCE
699 |:Fix Released: :rn:`5.5.33-31.1` |
700 |:Upstream fix: N/A |
701 +-------------------------------------------------------------------------------------------------------------+
702@@ -73,7 +116,11 @@
703 +-------------------------------------------------------------------------------------------------------------+
704 |:Upstream bug: :mysqlbug:`42415` - UPDATE/DELETE with LIMIT clause unsafe for SBL even with ORDER BY PK ... |
705 |:Launchpad bug: :bug:`1132194` |
706+<<<<<<< TREE
707 |:Upstream state: Verified (checked on 2014-04-29) |
708+=======
709+|:Upstream state: Verified (checked on 2014-03-17) |
710+>>>>>>> MERGE-SOURCE
711 |:Fix Released: :rn:`5.5.32-31.0` |
712 |:Upstream fix: N/A |
713 +-------------------------------------------------------------------------------------------------------------+
714@@ -85,7 +132,11 @@
715 +-------------------------------------------------------------------------------------------------------------+
716 |:Upstream bug: :mysqlbug:`68970` - fsp_reserve_free_extents switches from small to big tblspace handling ... |
717 |:Launchpad bug: :bug:`1169494` |
718+<<<<<<< TREE
719 |:Upstream state: Verified (checked on 2014-04-29) |
720+=======
721+|:Upstream state: Verified (checked on 2014-03-17) |
722+>>>>>>> MERGE-SOURCE
723 |:Fix Released: :rn:`5.5.32-31.0` |
724 |:Upstream fix: N/A |
725 +-------------------------------------------------------------------------------------------------------------+
726@@ -97,7 +148,11 @@
727 +-------------------------------------------------------------------------------------------------------------+
728 |:Upstream bug: :mysqlbug:`68999` - SSL_OP_NO_COMPRESSION not defined |
729 |:Launchpad bug: :bug:`1183610` |
730+<<<<<<< TREE
731 |:Upstream state: No Feedback (checked on 2014-04-29) |
732+=======
733+|:Upstream state: No Feedback (checked on 2014-03-17) |
734+>>>>>>> MERGE-SOURCE
735 |:Fix Released: :rn:`5.5.31-30.3` |
736 |:Upstream fix: N/A |
737 +-------------------------------------------------------------------------------------------------------------+
738@@ -109,7 +164,11 @@
739 +-------------------------------------------------------------------------------------------------------------+
740 |:Upstream bug: :mysqlbug:`68845` - Unnecessary log_sys->mutex reacquisition in mtr_log_reserve_and_write() |
741 |:Launchpad bug: :bug:`1163439` |
742+<<<<<<< TREE
743 |:Upstream state: Verified (checked on 2014-04-29) |
744+=======
745+|:Upstream state: Verified (checked on 2014-03-17) |
746+>>>>>>> MERGE-SOURCE
747 |:Fix Released: :rn:`5.5.30-30.2` |
748 |:Upstream fix: N/A |
749 +-------------------------------------------------------------------------------------------------------------+
750@@ -139,13 +198,21 @@
751 +-------------------------------------------------------------------------------------------------------------+
752 |:Upstream bug: :mysqlbug:`68476` - Suboptimal code in my_strnxfrm_simple() |
753 |:Launchpad bug: :bug:`1132350` |
754+<<<<<<< TREE
755 |:Upstream state: Verified (checked on 2014-04-29) |
756+=======
757+|:Upstream state: Verified (checked on 2014-03-17) |
758+>>>>>>> MERGE-SOURCE
759 |:Fix Released: :rn:`5.5.30-30.1` |
760 |:Upstream fix: N/A |
761 +-------------------------------------------------------------------------------------------------------------+
762 |:Upstream bug: :mysqlbug:`68116` - InnoDB monitor may hit an assertion error in buf_page_get_gen in debug ...|
763 |:Launchpad bug: :bug:`1100178` |
764+<<<<<<< TREE
765 |:Upstream state: Verified (checked on 2014-04-29) |
766+=======
767+|:Upstream state: Verified (checked on 2014-03-17) |
768+>>>>>>> MERGE-SOURCE
769 |:Fix Released: :rn:`5.5.29-30.0` |
770 |:Upstream fix: N/A |
771 +-------------------------------------------------------------------------------------------------------------+
772@@ -247,7 +314,11 @@
773 +-------------------------------------------------------------------------------------------------------------+
774 |:Upstream bug: :mysqlbug:`61178` - Incorrect implementation of intersect(ulonglong) in non-optimized Bitmap..|
775 |:Launchpad bug: :bug:`1042517` |
776+<<<<<<< TREE
777 |:Upstream state: Verified (checked on 2014-04-29) |
778+=======
779+|:Upstream state: Verified (checked on 2014-03-17) |
780+>>>>>>> MERGE-SOURCE
781 |:Fix Released: :rn:`5.5.27-29.0` |
782 |:Upstream fix: N/A |
783 +-------------------------------------------------------------------------------------------------------------+
784@@ -259,7 +330,11 @@
785 +-------------------------------------------------------------------------------------------------------------+
786 |:Upstream bug: :mysqlbug:`64800` - mysqldump with --include-master-host-port putting quotes around port no. |
787 |:Launchpad bug: :bug:`1013432` |
788+<<<<<<< TREE
789 |:Upstream state: Verified (checked on 2014-04-29) |
790+=======
791+|:Upstream state: Verified (checked on 2014-03-17) |
792+>>>>>>> MERGE-SOURCE
793 |:Fix Released: :rn:`5.5.27-28.0` |
794 |:Upstream fix: N/A |
795 +-------------------------------------------------------------------------------------------------------------+
796@@ -305,6 +380,7 @@
797 |:Fix Released: :rn:`5.5.21-25.0` |
798 |:Upstream fix: 5.5.28 |
799 +-------------------------------------------------------------------------------------------------------------+
800+<<<<<<< TREE
801 |:Upstream bug: :mysqlbug:`71183` - os_file_fsync() should handle fsync() returning EINTR |
802 |:Launchpad bug: :bug:`1262651` |
803 |:Upstream state: Verified (checked on 2014-04-29) |
804@@ -317,6 +393,20 @@
805 |:Fix Released: :rn:`5.5.18-23.0` |
806 |:Upstream fix: N/A |
807 +-------------------------------------------------------------------------------------------------------------+
808+=======
809+|:Upstream bug: :mysqlbug:`71183` - os_file_fsync() should handle fsync() returning EINTR |
810+|:Launchpad bug: :bug:`1262651` |
811+|:Upstream state: Verified (checked on 2014-03-17) |
812+|:Fix Released: :rn:`5.5.20-24.1` |
813+|:Upstream fix: N/A |
814++-------------------------------------------------------------------------------------------------------------+
815+|:Upstream bug: :mysqlbug:`63451` - atomic/x86-gcc.h:make_atomic_cas_body64 potential miscompilation bug |
816+|:Launchpad bug: :bug:`878022` |
817+|:Upstream state: Closed |
818+|:Fix Released: :rn:`5.5.18-23.0` |
819+|:Upstream fix: N/A |
820++-------------------------------------------------------------------------------------------------------------+
821+>>>>>>> MERGE-SOURCE
822 |:Upstream bug: :mysqlbug:`62557` - SHOW SLAVE STATUS gives wrong output with master-master and using SET... |
823 |:Launchpad bug: :bug:`860910` |
824 |:Upstream state: Closed |
825@@ -331,13 +421,21 @@
826 +-------------------------------------------------------------------------------------------------------------+
827 |:Upstream bug: :mysqlbug:`62516` - Fast index creation does not update index statistics |
828 |:Launchpad bug: :bug:`857590` |
829+<<<<<<< TREE
830 |:Upstream state: Verified (checked on 2014-04-29) |
831+=======
832+|:Upstream state: Verified (checked on 2014-03-17) |
833+>>>>>>> MERGE-SOURCE
834 |:Fix Released: :rn:`5.5.16-22.0` |
835 |:Upstream fix: N/A |
836 +-------------------------------------------------------------------------------------------------------------+
837 |:Upstream bug: :mysqlbug:`25007` - memory tables with dynamic rows format |
838 |:Launchpad bug: N/A |
839+<<<<<<< TREE
840 |:Upstream state: Verified (checked on 2014-04-29) |
841+=======
842+|:Upstream state: Verified (checked on 2014-03-17) |
843+>>>>>>> MERGE-SOURCE
844 |:Fix Released: :rn:`5.5.15-21.0` |
845 |:Upstream fix: N/A |
846 +-------------------------------------------------------------------------------------------------------------+
847@@ -355,7 +453,11 @@
848 +-------------------------------------------------------------------------------------------------------------+
849 |:Upstream bug: :mysqlbug:`61595` - mysql-test/include/wait_for_slave_param.inc timeout logic is incorrect |
850 |:Launchpad bug: :bug:`800035` |
851+<<<<<<< TREE
852 |:Upstream state: Verified (checked on 2014-04-29) |
853+=======
854+|:Upstream state: Verified (checked on 2014-03-17) |
855+>>>>>>> MERGE-SOURCE
856 |:Fix Released: :rn:`5.5.13-20.4` |
857 |:Upstream fix: N/A |
858 +-------------------------------------------------------------------------------------------------------------+
859@@ -385,6 +487,7 @@
860 +-------------------------------------------------------------------------------------------------------------+
861 |:Upstream bug: :mysqlbug:`69146` - Optimization in buf_pool_get_oldest_modification if srv_buf_pool_instances|
862 |:Launchpad bug: :bug:`1176496` |
863+<<<<<<< TREE
864 |:Upstream state: Open (checked on 2014-04-29) |
865 |:Fix Released: :rn:`5.5.8-20.0` |
866 |:Upstream fix: N/A |
867@@ -392,6 +495,15 @@
868 |:Upstream bug: :mysqlbug:`54814` - make BUF_READ_AHEAD_AREA a constant |
869 |:Launchpad bug: :bug:`606811` |
870 |:Upstream state: Closed |
871+=======
872+|:Upstream state: Open (checked on 2014-03-17) |
873+|:Fix Released: :rn:`5.5.8-20.0` |
874+|:Upstream fix: N/A |
875++-------------------------------------------------------------------------------------------------------------+
876+|:Upstream bug: :mysqlbug:`54814` - make BUF_READ_AHEAD_AREA a constant |
877+|:Launchpad bug: :bug:`606811` |
878+|:Upstream state: Closed |
879+>>>>>>> MERGE-SOURCE
880 |:Fix Released: :rn:`5.5.8-20.0` |
881 |:Upstream fix: N/A |
882 +-------------------------------------------------------------------------------------------------------------+
883
884=== modified file 'extra/yassl/src/handshake.cpp'
885--- extra/yassl/src/handshake.cpp 2014-01-08 13:01:42 +0000
886+++ extra/yassl/src/handshake.cpp 2014-05-14 14:34:53 +0000
887@@ -1,5 +1,9 @@
888 /*
889+<<<<<<< TREE
890 Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
891+=======
892+ Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
893+>>>>>>> MERGE-SOURCE
894
895 This program is free software; you can redistribute it and/or modify
896 it under the terms of the GNU General Public License as published by
897
898=== modified file 'extra/yassl/src/yassl_imp.cpp'
899--- extra/yassl/src/yassl_imp.cpp 2014-01-08 13:01:42 +0000
900+++ extra/yassl/src/yassl_imp.cpp 2014-05-14 14:34:53 +0000
901@@ -1,5 +1,9 @@
902 /*
903+<<<<<<< TREE
904 Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
905+=======
906+ Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
907+>>>>>>> MERGE-SOURCE
908
909 This program is free software; you can redistribute it and/or modify
910 it under the terms of the GNU General Public License as published by
911
912=== modified file 'libmysql/CMakeLists.txt'
913--- libmysql/CMakeLists.txt 2014-03-27 15:42:21 +0000
914+++ libmysql/CMakeLists.txt 2014-05-14 14:34:53 +0000
915@@ -1,4 +1,8 @@
916+<<<<<<< TREE
917 # Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
918+=======
919+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
920+>>>>>>> MERGE-SOURCE
921 #
922 # This program is free software; you can redistribute it and/or modify
923 # it under the terms of the GNU General Public License as published by
924@@ -192,6 +196,7 @@
925 SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION})
926 ENDIF()
927 ENDMACRO()
928+<<<<<<< TREE
929 ENDIF()
930
931 IF(UNIX)
932@@ -199,6 +204,9 @@
933 INSTALL_SYMLINK(perconaserverclient
934 ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a
935 ${INSTALL_LIBDIR} Development)
936+=======
937+ INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a perconaserverclient ${INSTALL_LIBDIR} Development)
938+>>>>>>> MERGE-SOURCE
939 ENDIF()
940
941 IF(NOT DISABLE_SHARED)
942
943=== modified file 'man/comp_err.1'
944--- man/comp_err.1 2014-03-27 15:42:21 +0000
945+++ man/comp_err.1 2014-05-14 14:34:53 +0000
946@@ -1,13 +1,22 @@
947 '\" t
948 .\" Title: \fBcomp_err\fR
949 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
950+<<<<<<< TREE
951 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
952 .\" Date: 03/14/2014
953+=======
954+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
955+.\" Date: 01/13/2014
956+>>>>>>> MERGE-SOURCE
957 .\" Manual: MySQL Database System
958 .\" Source: MySQL 5.5
959 .\" Language: English
960 .\"
961+<<<<<<< TREE
962 .TH "\FBCOMP_ERR\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
963+=======
964+.TH "\FBCOMP_ERR\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
965+>>>>>>> MERGE-SOURCE
966 .\" -----------------------------------------------------------------
967 .\" * Define some portability stuff
968 .\" -----------------------------------------------------------------
969
970=== modified file 'man/innochecksum.1'
971--- man/innochecksum.1 2014-03-27 15:42:21 +0000
972+++ man/innochecksum.1 2014-05-14 14:34:53 +0000
973@@ -1,13 +1,22 @@
974 '\" t
975 .\" Title: \fBinnochecksum\fR
976 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
977+<<<<<<< TREE
978 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
979 .\" Date: 03/14/2014
980+=======
981+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
982+.\" Date: 01/13/2014
983+>>>>>>> MERGE-SOURCE
984 .\" Manual: MySQL Database System
985 .\" Source: MySQL 5.5
986 .\" Language: English
987 .\"
988+<<<<<<< TREE
989 .TH "\FBINNOCHECKSUM\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
990+=======
991+.TH "\FBINNOCHECKSUM\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
992+>>>>>>> MERGE-SOURCE
993 .\" -----------------------------------------------------------------
994 .\" * Define some portability stuff
995 .\" -----------------------------------------------------------------
996
997=== modified file 'man/msql2mysql.1'
998--- man/msql2mysql.1 2014-03-27 15:42:21 +0000
999+++ man/msql2mysql.1 2014-05-14 14:34:53 +0000
1000@@ -1,13 +1,22 @@
1001 '\" t
1002 .\" Title: \fBmsql2mysql\fR
1003 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1004+<<<<<<< TREE
1005 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1006 .\" Date: 03/14/2014
1007+=======
1008+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1009+.\" Date: 01/13/2014
1010+>>>>>>> MERGE-SOURCE
1011 .\" Manual: MySQL Database System
1012 .\" Source: MySQL 5.5
1013 .\" Language: English
1014 .\"
1015+<<<<<<< TREE
1016 .TH "\FBMSQL2MYSQL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1017+=======
1018+.TH "\FBMSQL2MYSQL\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1019+>>>>>>> MERGE-SOURCE
1020 .\" -----------------------------------------------------------------
1021 .\" * Define some portability stuff
1022 .\" -----------------------------------------------------------------
1023
1024=== modified file 'man/my_print_defaults.1'
1025--- man/my_print_defaults.1 2014-03-27 15:42:21 +0000
1026+++ man/my_print_defaults.1 2014-05-14 14:34:53 +0000
1027@@ -1,13 +1,22 @@
1028 '\" t
1029 .\" Title: \fBmy_print_defaults\fR
1030 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1031+<<<<<<< TREE
1032 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1033 .\" Date: 03/14/2014
1034+=======
1035+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1036+.\" Date: 01/13/2014
1037+>>>>>>> MERGE-SOURCE
1038 .\" Manual: MySQL Database System
1039 .\" Source: MySQL 5.5
1040 .\" Language: English
1041 .\"
1042+<<<<<<< TREE
1043 .TH "\FBMY_PRINT_DEFAULTS" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1044+=======
1045+.TH "\FBMY_PRINT_DEFAULTS" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1046+>>>>>>> MERGE-SOURCE
1047 .\" -----------------------------------------------------------------
1048 .\" * Define some portability stuff
1049 .\" -----------------------------------------------------------------
1050
1051=== modified file 'man/myisam_ftdump.1'
1052--- man/myisam_ftdump.1 2014-03-27 15:42:21 +0000
1053+++ man/myisam_ftdump.1 2014-05-14 14:34:53 +0000
1054@@ -1,13 +1,22 @@
1055 '\" t
1056 .\" Title: \fBmyisam_ftdump\fR
1057 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1058+<<<<<<< TREE
1059 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1060 .\" Date: 03/14/2014
1061+=======
1062+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1063+.\" Date: 01/13/2014
1064+>>>>>>> MERGE-SOURCE
1065 .\" Manual: MySQL Database System
1066 .\" Source: MySQL 5.5
1067 .\" Language: English
1068 .\"
1069+<<<<<<< TREE
1070 .TH "\FBMYISAM_FTDUMP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1071+=======
1072+.TH "\FBMYISAM_FTDUMP\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1073+>>>>>>> MERGE-SOURCE
1074 .\" -----------------------------------------------------------------
1075 .\" * Define some portability stuff
1076 .\" -----------------------------------------------------------------
1077
1078=== modified file 'man/myisamchk.1'
1079--- man/myisamchk.1 2014-03-27 15:42:21 +0000
1080+++ man/myisamchk.1 2014-05-14 14:34:53 +0000
1081@@ -1,13 +1,22 @@
1082 '\" t
1083 .\" Title: \fBmyisamchk\fR
1084 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1085+<<<<<<< TREE
1086 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1087 .\" Date: 03/14/2014
1088+=======
1089+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1090+.\" Date: 01/13/2014
1091+>>>>>>> MERGE-SOURCE
1092 .\" Manual: MySQL Database System
1093 .\" Source: MySQL 5.5
1094 .\" Language: English
1095 .\"
1096+<<<<<<< TREE
1097 .TH "\FBMYISAMCHK\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1098+=======
1099+.TH "\FBMYISAMCHK\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1100+>>>>>>> MERGE-SOURCE
1101 .\" -----------------------------------------------------------------
1102 .\" * Define some portability stuff
1103 .\" -----------------------------------------------------------------
1104
1105=== modified file 'man/myisamlog.1'
1106--- man/myisamlog.1 2014-03-27 15:42:21 +0000
1107+++ man/myisamlog.1 2014-05-14 14:34:53 +0000
1108@@ -1,13 +1,22 @@
1109 '\" t
1110 .\" Title: \fBmyisamlog\fR
1111 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1112+<<<<<<< TREE
1113 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1114 .\" Date: 03/14/2014
1115+=======
1116+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1117+.\" Date: 01/13/2014
1118+>>>>>>> MERGE-SOURCE
1119 .\" Manual: MySQL Database System
1120 .\" Source: MySQL 5.5
1121 .\" Language: English
1122 .\"
1123+<<<<<<< TREE
1124 .TH "\FBMYISAMLOG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1125+=======
1126+.TH "\FBMYISAMLOG\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1127+>>>>>>> MERGE-SOURCE
1128 .\" -----------------------------------------------------------------
1129 .\" * Define some portability stuff
1130 .\" -----------------------------------------------------------------
1131
1132=== modified file 'man/myisampack.1'
1133--- man/myisampack.1 2014-03-27 15:42:21 +0000
1134+++ man/myisampack.1 2014-05-14 14:34:53 +0000
1135@@ -1,13 +1,22 @@
1136 '\" t
1137 .\" Title: \fBmyisampack\fR
1138 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1139+<<<<<<< TREE
1140 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1141 .\" Date: 03/14/2014
1142+=======
1143+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1144+.\" Date: 01/13/2014
1145+>>>>>>> MERGE-SOURCE
1146 .\" Manual: MySQL Database System
1147 .\" Source: MySQL 5.5
1148 .\" Language: English
1149 .\"
1150+<<<<<<< TREE
1151 .TH "\FBMYISAMPACK\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1152+=======
1153+.TH "\FBMYISAMPACK\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1154+>>>>>>> MERGE-SOURCE
1155 .\" -----------------------------------------------------------------
1156 .\" * Define some portability stuff
1157 .\" -----------------------------------------------------------------
1158
1159=== modified file 'man/mysql-stress-test.pl.1'
1160--- man/mysql-stress-test.pl.1 2014-03-27 15:42:21 +0000
1161+++ man/mysql-stress-test.pl.1 2014-05-14 14:34:53 +0000
1162@@ -1,13 +1,22 @@
1163 '\" t
1164 .\" Title: \fBmysql-stress-test.pl\fR
1165 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1166+<<<<<<< TREE
1167 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1168 .\" Date: 03/10/2014
1169+=======
1170+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1171+.\" Date: 01/10/2014
1172+>>>>>>> MERGE-SOURCE
1173 .\" Manual: MySQL Database System
1174 .\" Source: MySQL
1175 .\" Language: English
1176 .\"
1177+<<<<<<< TREE
1178 .TH "\FBMYSQL\-STRESS\-TE" "1" "03/10/2014" "MySQL" "MySQL Database System"
1179+=======
1180+.TH "\FBMYSQL\-STRESS\-TE" "1" "01/10/2014" "MySQL" "MySQL Database System"
1181+>>>>>>> MERGE-SOURCE
1182 .\" -----------------------------------------------------------------
1183 .\" * Define some portability stuff
1184 .\" -----------------------------------------------------------------
1185
1186=== modified file 'man/mysql-test-run.pl.1'
1187--- man/mysql-test-run.pl.1 2014-03-27 15:42:21 +0000
1188+++ man/mysql-test-run.pl.1 2014-05-14 14:34:53 +0000
1189@@ -1,13 +1,22 @@
1190 '\" t
1191 .\" Title: \fBmysql-test-run.pl\fR
1192 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1193+<<<<<<< TREE
1194 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1195 .\" Date: 03/10/2014
1196+=======
1197+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1198+.\" Date: 01/10/2014
1199+>>>>>>> MERGE-SOURCE
1200 .\" Manual: MySQL Database System
1201 .\" Source: MySQL
1202 .\" Language: English
1203 .\"
1204+<<<<<<< TREE
1205 .TH "\FBMYSQL\-TEST\-RUN\" "1" "03/10/2014" "MySQL" "MySQL Database System"
1206+=======
1207+.TH "\FBMYSQL\-TEST\-RUN\" "1" "01/10/2014" "MySQL" "MySQL Database System"
1208+>>>>>>> MERGE-SOURCE
1209 .\" -----------------------------------------------------------------
1210 .\" * Define some portability stuff
1211 .\" -----------------------------------------------------------------
1212
1213=== modified file 'man/mysql.1'
1214--- man/mysql.1 2014-03-27 15:42:21 +0000
1215+++ man/mysql.1 2014-05-14 14:34:53 +0000
1216@@ -1,13 +1,22 @@
1217 '\" t
1218 .\" Title: \fBmysql\fR
1219 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1220+<<<<<<< TREE
1221 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1222 .\" Date: 03/14/2014
1223+=======
1224+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1225+.\" Date: 01/13/2014
1226+>>>>>>> MERGE-SOURCE
1227 .\" Manual: MySQL Database System
1228 .\" Source: MySQL 5.5
1229 .\" Language: English
1230 .\"
1231+<<<<<<< TREE
1232 .TH "\FBMYSQL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1233+=======
1234+.TH "\FBMYSQL\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1235+>>>>>>> MERGE-SOURCE
1236 .\" -----------------------------------------------------------------
1237 .\" * Define some portability stuff
1238 .\" -----------------------------------------------------------------
1239
1240=== modified file 'man/mysql.server.1'
1241--- man/mysql.server.1 2014-03-27 15:42:21 +0000
1242+++ man/mysql.server.1 2014-05-14 14:34:53 +0000
1243@@ -1,13 +1,22 @@
1244 '\" t
1245 .\" Title: \fBmysql.server\fR
1246 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1247+<<<<<<< TREE
1248 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1249 .\" Date: 03/14/2014
1250+=======
1251+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1252+.\" Date: 01/13/2014
1253+>>>>>>> MERGE-SOURCE
1254 .\" Manual: MySQL Database System
1255 .\" Source: MySQL 5.5
1256 .\" Language: English
1257 .\"
1258+<<<<<<< TREE
1259 .TH "\FBMYSQL\&.SERVER\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1260+=======
1261+.TH "\FBMYSQL\&.SERVER\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1262+>>>>>>> MERGE-SOURCE
1263 .\" -----------------------------------------------------------------
1264 .\" * Define some portability stuff
1265 .\" -----------------------------------------------------------------
1266
1267=== modified file 'man/mysql_client_test.1'
1268--- man/mysql_client_test.1 2014-03-27 15:42:21 +0000
1269+++ man/mysql_client_test.1 2014-05-14 14:34:53 +0000
1270@@ -1,13 +1,22 @@
1271 '\" t
1272 .\" Title: \fBmysql_client_test\fR
1273 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1274+<<<<<<< TREE
1275 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1276 .\" Date: 03/10/2014
1277+=======
1278+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1279+.\" Date: 01/10/2014
1280+>>>>>>> MERGE-SOURCE
1281 .\" Manual: MySQL Database System
1282 .\" Source: MySQL
1283 .\" Language: English
1284 .\"
1285+<<<<<<< TREE
1286 .TH "\FBMYSQL_CLIENT_TEST" "1" "03/10/2014" "MySQL" "MySQL Database System"
1287+=======
1288+.TH "\FBMYSQL_CLIENT_TEST" "1" "01/10/2014" "MySQL" "MySQL Database System"
1289+>>>>>>> MERGE-SOURCE
1290 .\" -----------------------------------------------------------------
1291 .\" * Define some portability stuff
1292 .\" -----------------------------------------------------------------
1293
1294=== modified file 'man/mysql_config.1'
1295--- man/mysql_config.1 2014-03-27 15:42:21 +0000
1296+++ man/mysql_config.1 2014-05-14 14:34:53 +0000
1297@@ -1,13 +1,22 @@
1298 '\" t
1299 .\" Title: \fBmysql_config\fR
1300 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1301+<<<<<<< TREE
1302 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1303 .\" Date: 03/14/2014
1304+=======
1305+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1306+.\" Date: 01/13/2014
1307+>>>>>>> MERGE-SOURCE
1308 .\" Manual: MySQL Database System
1309 .\" Source: MySQL 5.5
1310 .\" Language: English
1311 .\"
1312+<<<<<<< TREE
1313 .TH "\FBMYSQL_CONFIG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1314+=======
1315+.TH "\FBMYSQL_CONFIG\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1316+>>>>>>> MERGE-SOURCE
1317 .\" -----------------------------------------------------------------
1318 .\" * Define some portability stuff
1319 .\" -----------------------------------------------------------------
1320
1321=== modified file 'man/mysql_convert_table_format.1'
1322--- man/mysql_convert_table_format.1 2014-03-27 15:42:21 +0000
1323+++ man/mysql_convert_table_format.1 2014-05-14 14:34:53 +0000
1324@@ -1,13 +1,22 @@
1325 '\" t
1326 .\" Title: \fBmysql_convert_table_format\fR
1327 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1328+<<<<<<< TREE
1329 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1330 .\" Date: 03/14/2014
1331+=======
1332+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1333+.\" Date: 01/13/2014
1334+>>>>>>> MERGE-SOURCE
1335 .\" Manual: MySQL Database System
1336 .\" Source: MySQL 5.5
1337 .\" Language: English
1338 .\"
1339+<<<<<<< TREE
1340 .TH "\FBMYSQL_CONVERT_TAB" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1341+=======
1342+.TH "\FBMYSQL_CONVERT_TAB" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1343+>>>>>>> MERGE-SOURCE
1344 .\" -----------------------------------------------------------------
1345 .\" * Define some portability stuff
1346 .\" -----------------------------------------------------------------
1347
1348=== modified file 'man/mysql_find_rows.1'
1349--- man/mysql_find_rows.1 2014-03-27 15:42:21 +0000
1350+++ man/mysql_find_rows.1 2014-05-14 14:34:53 +0000
1351@@ -1,13 +1,22 @@
1352 '\" t
1353 .\" Title: \fBmysql_find_rows\fR
1354 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1355+<<<<<<< TREE
1356 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1357 .\" Date: 03/14/2014
1358+=======
1359+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1360+.\" Date: 01/13/2014
1361+>>>>>>> MERGE-SOURCE
1362 .\" Manual: MySQL Database System
1363 .\" Source: MySQL 5.5
1364 .\" Language: English
1365 .\"
1366+<<<<<<< TREE
1367 .TH "\FBMYSQL_FIND_ROWS\F" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1368+=======
1369+.TH "\FBMYSQL_FIND_ROWS\F" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1370+>>>>>>> MERGE-SOURCE
1371 .\" -----------------------------------------------------------------
1372 .\" * Define some portability stuff
1373 .\" -----------------------------------------------------------------
1374
1375=== modified file 'man/mysql_fix_extensions.1'
1376--- man/mysql_fix_extensions.1 2014-03-27 15:42:21 +0000
1377+++ man/mysql_fix_extensions.1 2014-05-14 14:34:53 +0000
1378@@ -1,13 +1,22 @@
1379 '\" t
1380 .\" Title: \fBmysql_fix_extensions\fR
1381 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1382+<<<<<<< TREE
1383 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1384 .\" Date: 03/14/2014
1385+=======
1386+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1387+.\" Date: 01/13/2014
1388+>>>>>>> MERGE-SOURCE
1389 .\" Manual: MySQL Database System
1390 .\" Source: MySQL 5.5
1391 .\" Language: English
1392 .\"
1393+<<<<<<< TREE
1394 .TH "\FBMYSQL_FIX_EXTENSI" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1395+=======
1396+.TH "\FBMYSQL_FIX_EXTENSI" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1397+>>>>>>> MERGE-SOURCE
1398 .\" -----------------------------------------------------------------
1399 .\" * Define some portability stuff
1400 .\" -----------------------------------------------------------------
1401
1402=== modified file 'man/mysql_install_db.1'
1403--- man/mysql_install_db.1 2014-03-27 15:42:21 +0000
1404+++ man/mysql_install_db.1 2014-05-14 14:34:53 +0000
1405@@ -1,13 +1,22 @@
1406 '\" t
1407 .\" Title: \fBmysql_install_db\fR
1408 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1409+<<<<<<< TREE
1410 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1411 .\" Date: 03/14/2014
1412+=======
1413+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1414+.\" Date: 01/13/2014
1415+>>>>>>> MERGE-SOURCE
1416 .\" Manual: MySQL Database System
1417 .\" Source: MySQL 5.5
1418 .\" Language: English
1419 .\"
1420+<<<<<<< TREE
1421 .TH "\FBMYSQL_INSTALL_DB\" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1422+=======
1423+.TH "\FBMYSQL_INSTALL_DB\" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1424+>>>>>>> MERGE-SOURCE
1425 .\" -----------------------------------------------------------------
1426 .\" * Define some portability stuff
1427 .\" -----------------------------------------------------------------
1428
1429=== modified file 'man/mysql_plugin.1'
1430--- man/mysql_plugin.1 2014-03-27 15:42:21 +0000
1431+++ man/mysql_plugin.1 2014-05-14 14:34:53 +0000
1432@@ -1,13 +1,22 @@
1433 '\" t
1434 .\" Title: \fBmysql_plugin\fR
1435 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1436+<<<<<<< TREE
1437 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1438 .\" Date: 03/14/2014
1439+=======
1440+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1441+.\" Date: 01/13/2014
1442+>>>>>>> MERGE-SOURCE
1443 .\" Manual: MySQL Database System
1444 .\" Source: MySQL 5.5
1445 .\" Language: English
1446 .\"
1447+<<<<<<< TREE
1448 .TH "\FBMYSQL_PLUGIN\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1449+=======
1450+.TH "\FBMYSQL_PLUGIN\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1451+>>>>>>> MERGE-SOURCE
1452 .\" -----------------------------------------------------------------
1453 .\" * Define some portability stuff
1454 .\" -----------------------------------------------------------------
1455
1456=== modified file 'man/mysql_secure_installation.1'
1457--- man/mysql_secure_installation.1 2014-03-27 15:42:21 +0000
1458+++ man/mysql_secure_installation.1 2014-05-14 14:34:53 +0000
1459@@ -1,13 +1,22 @@
1460 '\" t
1461 .\" Title: \fBmysql_secure_installation\fR
1462 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1463+<<<<<<< TREE
1464 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1465 .\" Date: 03/14/2014
1466+=======
1467+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1468+.\" Date: 01/13/2014
1469+>>>>>>> MERGE-SOURCE
1470 .\" Manual: MySQL Database System
1471 .\" Source: MySQL 5.5
1472 .\" Language: English
1473 .\"
1474+<<<<<<< TREE
1475 .TH "\FBMYSQL_SECURE_INST" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1476+=======
1477+.TH "\FBMYSQL_SECURE_INST" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1478+>>>>>>> MERGE-SOURCE
1479 .\" -----------------------------------------------------------------
1480 .\" * Define some portability stuff
1481 .\" -----------------------------------------------------------------
1482
1483=== modified file 'man/mysql_setpermission.1'
1484--- man/mysql_setpermission.1 2014-03-27 15:42:21 +0000
1485+++ man/mysql_setpermission.1 2014-05-14 14:34:53 +0000
1486@@ -1,13 +1,22 @@
1487 '\" t
1488 .\" Title: \fBmysql_setpermission\fR
1489 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1490+<<<<<<< TREE
1491 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1492 .\" Date: 03/14/2014
1493+=======
1494+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1495+.\" Date: 01/13/2014
1496+>>>>>>> MERGE-SOURCE
1497 .\" Manual: MySQL Database System
1498 .\" Source: MySQL 5.5
1499 .\" Language: English
1500 .\"
1501+<<<<<<< TREE
1502 .TH "\FBMYSQL_SETPERMISSI" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1503+=======
1504+.TH "\FBMYSQL_SETPERMISSI" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1505+>>>>>>> MERGE-SOURCE
1506 .\" -----------------------------------------------------------------
1507 .\" * Define some portability stuff
1508 .\" -----------------------------------------------------------------
1509
1510=== modified file 'man/mysql_tzinfo_to_sql.1'
1511--- man/mysql_tzinfo_to_sql.1 2014-03-27 15:42:21 +0000
1512+++ man/mysql_tzinfo_to_sql.1 2014-05-14 14:34:53 +0000
1513@@ -1,13 +1,22 @@
1514 '\" t
1515 .\" Title: \fBmysql_tzinfo_to_sql\fR
1516 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1517+<<<<<<< TREE
1518 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1519 .\" Date: 03/14/2014
1520+=======
1521+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1522+.\" Date: 01/13/2014
1523+>>>>>>> MERGE-SOURCE
1524 .\" Manual: MySQL Database System
1525 .\" Source: MySQL 5.5
1526 .\" Language: English
1527 .\"
1528+<<<<<<< TREE
1529 .TH "\FBMYSQL_TZINFO_TO_S" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1530+=======
1531+.TH "\FBMYSQL_TZINFO_TO_S" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1532+>>>>>>> MERGE-SOURCE
1533 .\" -----------------------------------------------------------------
1534 .\" * Define some portability stuff
1535 .\" -----------------------------------------------------------------
1536
1537=== modified file 'man/mysql_upgrade.1'
1538--- man/mysql_upgrade.1 2014-03-27 15:42:21 +0000
1539+++ man/mysql_upgrade.1 2014-05-14 14:34:53 +0000
1540@@ -1,13 +1,22 @@
1541 '\" t
1542 .\" Title: \fBmysql_upgrade\fR
1543 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1544+<<<<<<< TREE
1545 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1546 .\" Date: 03/14/2014
1547+=======
1548+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1549+.\" Date: 01/13/2014
1550+>>>>>>> MERGE-SOURCE
1551 .\" Manual: MySQL Database System
1552 .\" Source: MySQL 5.5
1553 .\" Language: English
1554 .\"
1555+<<<<<<< TREE
1556 .TH "\FBMYSQL_UPGRADE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1557+=======
1558+.TH "\FBMYSQL_UPGRADE\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1559+>>>>>>> MERGE-SOURCE
1560 .\" -----------------------------------------------------------------
1561 .\" * Define some portability stuff
1562 .\" -----------------------------------------------------------------
1563
1564=== modified file 'man/mysql_waitpid.1'
1565--- man/mysql_waitpid.1 2014-03-27 15:42:21 +0000
1566+++ man/mysql_waitpid.1 2014-05-14 14:34:53 +0000
1567@@ -1,13 +1,22 @@
1568 '\" t
1569 .\" Title: \fBmysql_waitpid\fR
1570 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1571+<<<<<<< TREE
1572 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1573 .\" Date: 03/14/2014
1574+=======
1575+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1576+.\" Date: 01/13/2014
1577+>>>>>>> MERGE-SOURCE
1578 .\" Manual: MySQL Database System
1579 .\" Source: MySQL 5.5
1580 .\" Language: English
1581 .\"
1582+<<<<<<< TREE
1583 .TH "\FBMYSQL_WAITPID\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1584+=======
1585+.TH "\FBMYSQL_WAITPID\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1586+>>>>>>> MERGE-SOURCE
1587 .\" -----------------------------------------------------------------
1588 .\" * Define some portability stuff
1589 .\" -----------------------------------------------------------------
1590
1591=== modified file 'man/mysql_zap.1'
1592--- man/mysql_zap.1 2014-03-27 15:42:21 +0000
1593+++ man/mysql_zap.1 2014-05-14 14:34:53 +0000
1594@@ -1,13 +1,22 @@
1595 '\" t
1596 .\" Title: \fBmysql_zap\fR
1597 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1598+<<<<<<< TREE
1599 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1600 .\" Date: 03/14/2014
1601+=======
1602+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1603+.\" Date: 01/13/2014
1604+>>>>>>> MERGE-SOURCE
1605 .\" Manual: MySQL Database System
1606 .\" Source: MySQL 5.5
1607 .\" Language: English
1608 .\"
1609+<<<<<<< TREE
1610 .TH "\FBMYSQL_ZAP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1611+=======
1612+.TH "\FBMYSQL_ZAP\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1613+>>>>>>> MERGE-SOURCE
1614 .\" -----------------------------------------------------------------
1615 .\" * Define some portability stuff
1616 .\" -----------------------------------------------------------------
1617
1618=== modified file 'man/mysqlaccess.1'
1619--- man/mysqlaccess.1 2014-03-27 15:42:21 +0000
1620+++ man/mysqlaccess.1 2014-05-14 14:34:53 +0000
1621@@ -1,13 +1,22 @@
1622 '\" t
1623 .\" Title: \fBmysqlaccess\fR
1624 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1625+<<<<<<< TREE
1626 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1627 .\" Date: 03/14/2014
1628+=======
1629+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1630+.\" Date: 01/13/2014
1631+>>>>>>> MERGE-SOURCE
1632 .\" Manual: MySQL Database System
1633 .\" Source: MySQL 5.5
1634 .\" Language: English
1635 .\"
1636+<<<<<<< TREE
1637 .TH "\FBMYSQLACCESS\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1638+=======
1639+.TH "\FBMYSQLACCESS\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1640+>>>>>>> MERGE-SOURCE
1641 .\" -----------------------------------------------------------------
1642 .\" * Define some portability stuff
1643 .\" -----------------------------------------------------------------
1644
1645=== modified file 'man/mysqladmin.1'
1646--- man/mysqladmin.1 2014-03-27 15:42:21 +0000
1647+++ man/mysqladmin.1 2014-05-14 14:34:53 +0000
1648@@ -1,13 +1,22 @@
1649 '\" t
1650 .\" Title: \fBmysqladmin\fR
1651 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1652+<<<<<<< TREE
1653 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1654 .\" Date: 03/14/2014
1655+=======
1656+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1657+.\" Date: 01/13/2014
1658+>>>>>>> MERGE-SOURCE
1659 .\" Manual: MySQL Database System
1660 .\" Source: MySQL 5.5
1661 .\" Language: English
1662 .\"
1663+<<<<<<< TREE
1664 .TH "\FBMYSQLADMIN\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1665+=======
1666+.TH "\FBMYSQLADMIN\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1667+>>>>>>> MERGE-SOURCE
1668 .\" -----------------------------------------------------------------
1669 .\" * Define some portability stuff
1670 .\" -----------------------------------------------------------------
1671
1672=== modified file 'man/mysqlbinlog.1'
1673--- man/mysqlbinlog.1 2014-03-27 15:42:21 +0000
1674+++ man/mysqlbinlog.1 2014-05-14 14:34:53 +0000
1675@@ -1,13 +1,22 @@
1676 '\" t
1677 .\" Title: \fBmysqlbinlog\fR
1678 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1679+<<<<<<< TREE
1680 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1681 .\" Date: 03/14/2014
1682+=======
1683+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1684+.\" Date: 01/13/2014
1685+>>>>>>> MERGE-SOURCE
1686 .\" Manual: MySQL Database System
1687 .\" Source: MySQL 5.5
1688 .\" Language: English
1689 .\"
1690+<<<<<<< TREE
1691 .TH "\FBMYSQLBINLOG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1692+=======
1693+.TH "\FBMYSQLBINLOG\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1694+>>>>>>> MERGE-SOURCE
1695 .\" -----------------------------------------------------------------
1696 .\" * Define some portability stuff
1697 .\" -----------------------------------------------------------------
1698
1699=== modified file 'man/mysqlbug.1'
1700--- man/mysqlbug.1 2014-03-27 15:42:21 +0000
1701+++ man/mysqlbug.1 2014-05-14 14:34:53 +0000
1702@@ -1,13 +1,22 @@
1703 '\" t
1704 .\" Title: \fBmysqlbug\fR
1705 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1706+<<<<<<< TREE
1707 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1708 .\" Date: 03/14/2014
1709+=======
1710+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1711+.\" Date: 01/13/2014
1712+>>>>>>> MERGE-SOURCE
1713 .\" Manual: MySQL Database System
1714 .\" Source: MySQL 5.5
1715 .\" Language: English
1716 .\"
1717+<<<<<<< TREE
1718 .TH "\FBMYSQLBUG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1719+=======
1720+.TH "\FBMYSQLBUG\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1721+>>>>>>> MERGE-SOURCE
1722 .\" -----------------------------------------------------------------
1723 .\" * Define some portability stuff
1724 .\" -----------------------------------------------------------------
1725
1726=== modified file 'man/mysqlcheck.1'
1727--- man/mysqlcheck.1 2014-03-27 15:42:21 +0000
1728+++ man/mysqlcheck.1 2014-05-14 14:34:53 +0000
1729@@ -1,13 +1,22 @@
1730 '\" t
1731 .\" Title: \fBmysqlcheck\fR
1732 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1733+<<<<<<< TREE
1734 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1735 .\" Date: 03/14/2014
1736+=======
1737+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1738+.\" Date: 01/13/2014
1739+>>>>>>> MERGE-SOURCE
1740 .\" Manual: MySQL Database System
1741 .\" Source: MySQL 5.5
1742 .\" Language: English
1743 .\"
1744+<<<<<<< TREE
1745 .TH "\FBMYSQLCHECK\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1746+=======
1747+.TH "\FBMYSQLCHECK\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1748+>>>>>>> MERGE-SOURCE
1749 .\" -----------------------------------------------------------------
1750 .\" * Define some portability stuff
1751 .\" -----------------------------------------------------------------
1752
1753=== modified file 'man/mysqld.8'
1754--- man/mysqld.8 2014-03-27 15:42:21 +0000
1755+++ man/mysqld.8 2014-05-14 14:34:53 +0000
1756@@ -1,13 +1,22 @@
1757 '\" t
1758 .\" Title: \fBmysqld\fR
1759 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1760+<<<<<<< TREE
1761 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1762 .\" Date: 03/14/2014
1763+=======
1764+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1765+.\" Date: 01/13/2014
1766+>>>>>>> MERGE-SOURCE
1767 .\" Manual: MySQL Database System
1768 .\" Source: MySQL 5.5
1769 .\" Language: English
1770 .\"
1771+<<<<<<< TREE
1772 .TH "\FBMYSQLD\FR" "8" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1773+=======
1774+.TH "\FBMYSQLD\FR" "8" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1775+>>>>>>> MERGE-SOURCE
1776 .\" -----------------------------------------------------------------
1777 .\" * Define some portability stuff
1778 .\" -----------------------------------------------------------------
1779
1780=== modified file 'man/mysqld_multi.1'
1781--- man/mysqld_multi.1 2014-03-27 15:42:21 +0000
1782+++ man/mysqld_multi.1 2014-05-14 14:34:53 +0000
1783@@ -1,13 +1,22 @@
1784 '\" t
1785 .\" Title: \fBmysqld_multi\fR
1786 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1787+<<<<<<< TREE
1788 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1789 .\" Date: 03/14/2014
1790+=======
1791+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1792+.\" Date: 01/13/2014
1793+>>>>>>> MERGE-SOURCE
1794 .\" Manual: MySQL Database System
1795 .\" Source: MySQL 5.5
1796 .\" Language: English
1797 .\"
1798+<<<<<<< TREE
1799 .TH "\FBMYSQLD_MULTI\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1800+=======
1801+.TH "\FBMYSQLD_MULTI\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1802+>>>>>>> MERGE-SOURCE
1803 .\" -----------------------------------------------------------------
1804 .\" * Define some portability stuff
1805 .\" -----------------------------------------------------------------
1806
1807=== modified file 'man/mysqld_safe.1'
1808--- man/mysqld_safe.1 2014-03-27 15:42:21 +0000
1809+++ man/mysqld_safe.1 2014-05-14 14:34:53 +0000
1810@@ -1,13 +1,22 @@
1811 '\" t
1812 .\" Title: \fBmysqld_safe\fR
1813 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1814+<<<<<<< TREE
1815 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1816 .\" Date: 03/14/2014
1817+=======
1818+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1819+.\" Date: 01/13/2014
1820+>>>>>>> MERGE-SOURCE
1821 .\" Manual: MySQL Database System
1822 .\" Source: MySQL 5.5
1823 .\" Language: English
1824 .\"
1825+<<<<<<< TREE
1826 .TH "\FBMYSQLD_SAFE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1827+=======
1828+.TH "\FBMYSQLD_SAFE\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1829+>>>>>>> MERGE-SOURCE
1830 .\" -----------------------------------------------------------------
1831 .\" * Define some portability stuff
1832 .\" -----------------------------------------------------------------
1833
1834=== modified file 'man/mysqldump.1'
1835--- man/mysqldump.1 2014-03-27 15:42:21 +0000
1836+++ man/mysqldump.1 2014-05-14 14:34:53 +0000
1837@@ -1,13 +1,22 @@
1838 '\" t
1839 .\" Title: \fBmysqldump\fR
1840 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1841+<<<<<<< TREE
1842 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1843 .\" Date: 03/14/2014
1844+=======
1845+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1846+.\" Date: 01/13/2014
1847+>>>>>>> MERGE-SOURCE
1848 .\" Manual: MySQL Database System
1849 .\" Source: MySQL 5.5
1850 .\" Language: English
1851 .\"
1852+<<<<<<< TREE
1853 .TH "\FBMYSQLDUMP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1854+=======
1855+.TH "\FBMYSQLDUMP\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1856+>>>>>>> MERGE-SOURCE
1857 .\" -----------------------------------------------------------------
1858 .\" * Define some portability stuff
1859 .\" -----------------------------------------------------------------
1860
1861=== modified file 'man/mysqldumpslow.1'
1862--- man/mysqldumpslow.1 2014-03-27 15:42:21 +0000
1863+++ man/mysqldumpslow.1 2014-05-14 14:34:53 +0000
1864@@ -1,13 +1,22 @@
1865 '\" t
1866 .\" Title: \fBmysqldumpslow\fR
1867 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1868+<<<<<<< TREE
1869 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1870 .\" Date: 03/14/2014
1871+=======
1872+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1873+.\" Date: 01/13/2014
1874+>>>>>>> MERGE-SOURCE
1875 .\" Manual: MySQL Database System
1876 .\" Source: MySQL 5.5
1877 .\" Language: English
1878 .\"
1879+<<<<<<< TREE
1880 .TH "\FBMYSQLDUMPSLOW\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1881+=======
1882+.TH "\FBMYSQLDUMPSLOW\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1883+>>>>>>> MERGE-SOURCE
1884 .\" -----------------------------------------------------------------
1885 .\" * Define some portability stuff
1886 .\" -----------------------------------------------------------------
1887
1888=== modified file 'man/mysqlhotcopy.1'
1889--- man/mysqlhotcopy.1 2014-03-27 15:42:21 +0000
1890+++ man/mysqlhotcopy.1 2014-05-14 14:34:53 +0000
1891@@ -1,13 +1,22 @@
1892 '\" t
1893 .\" Title: \fBmysqlhotcopy\fR
1894 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1895+<<<<<<< TREE
1896 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1897 .\" Date: 03/14/2014
1898+=======
1899+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1900+.\" Date: 01/13/2014
1901+>>>>>>> MERGE-SOURCE
1902 .\" Manual: MySQL Database System
1903 .\" Source: MySQL 5.5
1904 .\" Language: English
1905 .\"
1906+<<<<<<< TREE
1907 .TH "\FBMYSQLHOTCOPY\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1908+=======
1909+.TH "\FBMYSQLHOTCOPY\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1910+>>>>>>> MERGE-SOURCE
1911 .\" -----------------------------------------------------------------
1912 .\" * Define some portability stuff
1913 .\" -----------------------------------------------------------------
1914
1915=== modified file 'man/mysqlimport.1'
1916--- man/mysqlimport.1 2014-03-27 15:42:21 +0000
1917+++ man/mysqlimport.1 2014-05-14 14:34:53 +0000
1918@@ -1,13 +1,22 @@
1919 '\" t
1920 .\" Title: \fBmysqlimport\fR
1921 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1922+<<<<<<< TREE
1923 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1924 .\" Date: 03/14/2014
1925+=======
1926+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1927+.\" Date: 01/13/2014
1928+>>>>>>> MERGE-SOURCE
1929 .\" Manual: MySQL Database System
1930 .\" Source: MySQL 5.5
1931 .\" Language: English
1932 .\"
1933+<<<<<<< TREE
1934 .TH "\FBMYSQLIMPORT\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1935+=======
1936+.TH "\FBMYSQLIMPORT\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1937+>>>>>>> MERGE-SOURCE
1938 .\" -----------------------------------------------------------------
1939 .\" * Define some portability stuff
1940 .\" -----------------------------------------------------------------
1941
1942=== modified file 'man/mysqlshow.1'
1943--- man/mysqlshow.1 2014-03-27 15:42:21 +0000
1944+++ man/mysqlshow.1 2014-05-14 14:34:53 +0000
1945@@ -1,13 +1,22 @@
1946 '\" t
1947 .\" Title: \fBmysqlshow\fR
1948 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1949+<<<<<<< TREE
1950 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1951 .\" Date: 03/14/2014
1952+=======
1953+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1954+.\" Date: 01/13/2014
1955+>>>>>>> MERGE-SOURCE
1956 .\" Manual: MySQL Database System
1957 .\" Source: MySQL 5.5
1958 .\" Language: English
1959 .\"
1960+<<<<<<< TREE
1961 .TH "\FBMYSQLSHOW\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1962+=======
1963+.TH "\FBMYSQLSHOW\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1964+>>>>>>> MERGE-SOURCE
1965 .\" -----------------------------------------------------------------
1966 .\" * Define some portability stuff
1967 .\" -----------------------------------------------------------------
1968
1969=== modified file 'man/mysqlslap.1'
1970--- man/mysqlslap.1 2014-03-27 15:42:21 +0000
1971+++ man/mysqlslap.1 2014-05-14 14:34:53 +0000
1972@@ -1,13 +1,22 @@
1973 '\" t
1974 .\" Title: \fBmysqlslap\fR
1975 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
1976+<<<<<<< TREE
1977 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1978 .\" Date: 03/14/2014
1979+=======
1980+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
1981+.\" Date: 01/13/2014
1982+>>>>>>> MERGE-SOURCE
1983 .\" Manual: MySQL Database System
1984 .\" Source: MySQL 5.5
1985 .\" Language: English
1986 .\"
1987+<<<<<<< TREE
1988 .TH "\FBMYSQLSLAP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
1989+=======
1990+.TH "\FBMYSQLSLAP\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
1991+>>>>>>> MERGE-SOURCE
1992 .\" -----------------------------------------------------------------
1993 .\" * Define some portability stuff
1994 .\" -----------------------------------------------------------------
1995
1996=== modified file 'man/mysqltest.1'
1997--- man/mysqltest.1 2014-03-27 15:42:21 +0000
1998+++ man/mysqltest.1 2014-05-14 14:34:53 +0000
1999@@ -1,13 +1,22 @@
2000 '\" t
2001 .\" Title: \fBmysqltest\fR
2002 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2003+<<<<<<< TREE
2004 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2005 .\" Date: 03/10/2014
2006+=======
2007+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2008+.\" Date: 01/10/2014
2009+>>>>>>> MERGE-SOURCE
2010 .\" Manual: MySQL Database System
2011 .\" Source: MySQL
2012 .\" Language: English
2013 .\"
2014+<<<<<<< TREE
2015 .TH "\FBMYSQLTEST\FR" "1" "03/10/2014" "MySQL" "MySQL Database System"
2016+=======
2017+.TH "\FBMYSQLTEST\FR" "1" "01/10/2014" "MySQL" "MySQL Database System"
2018+>>>>>>> MERGE-SOURCE
2019 .\" -----------------------------------------------------------------
2020 .\" * Define some portability stuff
2021 .\" -----------------------------------------------------------------
2022
2023=== modified file 'man/ndb-common-options.1'
2024--- man/ndb-common-options.1 2014-03-27 15:42:21 +0000
2025+++ man/ndb-common-options.1 2014-05-14 14:34:53 +0000
2026@@ -1,13 +1,22 @@
2027 '\" t
2028 .\" Title: Options Common to MySQL Cluster Programs
2029 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2030+<<<<<<< TREE
2031 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2032 .\" Date: 03/14/2014
2033+=======
2034+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2035+.\" Date: 01/13/2014
2036+>>>>>>> MERGE-SOURCE
2037 .\" Manual: MySQL Database System
2038 .\" Source: MySQL 5.5
2039 .\" Language: English
2040 .\"
2041+<<<<<<< TREE
2042 .TH "OPTIONS COMMON TO MY" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2043+=======
2044+.TH "OPTIONS COMMON TO MY" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2045+>>>>>>> MERGE-SOURCE
2046 .\" -----------------------------------------------------------------
2047 .\" * Define some portability stuff
2048 .\" -----------------------------------------------------------------
2049
2050=== modified file 'man/ndb_blob_tool.1'
2051--- man/ndb_blob_tool.1 2014-03-27 15:42:21 +0000
2052+++ man/ndb_blob_tool.1 2014-05-14 14:34:53 +0000
2053@@ -1,13 +1,22 @@
2054 '\" t
2055 .\" Title: \fBndb_blob_tool\fR
2056 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2057+<<<<<<< TREE
2058 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2059 .\" Date: 03/14/2014
2060+=======
2061+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2062+.\" Date: 01/13/2014
2063+>>>>>>> MERGE-SOURCE
2064 .\" Manual: MySQL Database System
2065 .\" Source: MySQL 5.5
2066 .\" Language: English
2067 .\"
2068+<<<<<<< TREE
2069 .TH "\FBNDB_BLOB_TOOL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2070+=======
2071+.TH "\FBNDB_BLOB_TOOL\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2072+>>>>>>> MERGE-SOURCE
2073 .\" -----------------------------------------------------------------
2074 .\" * Define some portability stuff
2075 .\" -----------------------------------------------------------------
2076
2077=== modified file 'man/ndb_config.1'
2078--- man/ndb_config.1 2014-03-27 15:42:21 +0000
2079+++ man/ndb_config.1 2014-05-14 14:34:53 +0000
2080@@ -1,13 +1,22 @@
2081 '\" t
2082 .\" Title: \fBndb_config\fR
2083 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2084+<<<<<<< TREE
2085 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2086 .\" Date: 03/14/2014
2087+=======
2088+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2089+.\" Date: 01/13/2014
2090+>>>>>>> MERGE-SOURCE
2091 .\" Manual: MySQL Database System
2092 .\" Source: MySQL 5.5
2093 .\" Language: English
2094 .\"
2095+<<<<<<< TREE
2096 .TH "\FBNDB_CONFIG\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2097+=======
2098+.TH "\FBNDB_CONFIG\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2099+>>>>>>> MERGE-SOURCE
2100 .\" -----------------------------------------------------------------
2101 .\" * Define some portability stuff
2102 .\" -----------------------------------------------------------------
2103@@ -1230,7 +1239,11 @@
2104 .\}
2105 .nf
2106 shell> \fBndb_config \-\-configinfo \-\-xml\fR
2107+<<<<<<< TREE
2108 <configvariables protocolversion="1" ndbversionstring="5\&.5\&.36\-ndb\-7\&.2\&.16"
2109+=======
2110+<configvariables protocolversion="1" ndbversionstring="5\&.5\&.34\-ndb\-7\&.2\&.15"
2111+>>>>>>> MERGE-SOURCE
2112 ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
2113 ndbversionbuild="6">
2114 <section name="SYSTEM">
2115
2116=== modified file 'man/ndb_cpcd.1'
2117--- man/ndb_cpcd.1 2014-03-27 15:42:21 +0000
2118+++ man/ndb_cpcd.1 2014-05-14 14:34:53 +0000
2119@@ -1,13 +1,22 @@
2120 '\" t
2121 .\" Title: \fBndb_cpcd\fR
2122 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2123+<<<<<<< TREE
2124 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2125 .\" Date: 03/14/2014
2126+=======
2127+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2128+.\" Date: 01/13/2014
2129+>>>>>>> MERGE-SOURCE
2130 .\" Manual: MySQL Database System
2131 .\" Source: MySQL 5.5
2132 .\" Language: English
2133 .\"
2134+<<<<<<< TREE
2135 .TH "\FBNDB_CPCD\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2136+=======
2137+.TH "\FBNDB_CPCD\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2138+>>>>>>> MERGE-SOURCE
2139 .\" -----------------------------------------------------------------
2140 .\" * Define some portability stuff
2141 .\" -----------------------------------------------------------------
2142
2143=== modified file 'man/ndb_delete_all.1'
2144--- man/ndb_delete_all.1 2014-03-27 15:42:21 +0000
2145+++ man/ndb_delete_all.1 2014-05-14 14:34:53 +0000
2146@@ -1,13 +1,22 @@
2147 '\" t
2148 .\" Title: \fBndb_delete_all\fR
2149 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2150+<<<<<<< TREE
2151 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2152 .\" Date: 03/14/2014
2153+=======
2154+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2155+.\" Date: 01/13/2014
2156+>>>>>>> MERGE-SOURCE
2157 .\" Manual: MySQL Database System
2158 .\" Source: MySQL 5.5
2159 .\" Language: English
2160 .\"
2161+<<<<<<< TREE
2162 .TH "\FBNDB_DELETE_ALL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2163+=======
2164+.TH "\FBNDB_DELETE_ALL\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2165+>>>>>>> MERGE-SOURCE
2166 .\" -----------------------------------------------------------------
2167 .\" * Define some portability stuff
2168 .\" -----------------------------------------------------------------
2169
2170=== modified file 'man/ndb_desc.1'
2171--- man/ndb_desc.1 2014-03-27 15:42:21 +0000
2172+++ man/ndb_desc.1 2014-05-14 14:34:53 +0000
2173@@ -1,13 +1,22 @@
2174 '\" t
2175 .\" Title: \fBndb_desc\fR
2176 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2177+<<<<<<< TREE
2178 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2179 .\" Date: 03/14/2014
2180+=======
2181+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2182+.\" Date: 01/13/2014
2183+>>>>>>> MERGE-SOURCE
2184 .\" Manual: MySQL Database System
2185 .\" Source: MySQL 5.5
2186 .\" Language: English
2187 .\"
2188+<<<<<<< TREE
2189 .TH "\FBNDB_DESC\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2190+=======
2191+.TH "\FBNDB_DESC\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2192+>>>>>>> MERGE-SOURCE
2193 .\" -----------------------------------------------------------------
2194 .\" * Define some portability stuff
2195 .\" -----------------------------------------------------------------
2196
2197=== modified file 'man/ndb_drop_index.1'
2198--- man/ndb_drop_index.1 2014-03-27 15:42:21 +0000
2199+++ man/ndb_drop_index.1 2014-05-14 14:34:53 +0000
2200@@ -1,13 +1,22 @@
2201 '\" t
2202 .\" Title: \fBndb_drop_index\fR
2203 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2204+<<<<<<< TREE
2205 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2206 .\" Date: 03/14/2014
2207+=======
2208+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2209+.\" Date: 01/13/2014
2210+>>>>>>> MERGE-SOURCE
2211 .\" Manual: MySQL Database System
2212 .\" Source: MySQL 5.5
2213 .\" Language: English
2214 .\"
2215+<<<<<<< TREE
2216 .TH "\FBNDB_DROP_INDEX\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2217+=======
2218+.TH "\FBNDB_DROP_INDEX\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2219+>>>>>>> MERGE-SOURCE
2220 .\" -----------------------------------------------------------------
2221 .\" * Define some portability stuff
2222 .\" -----------------------------------------------------------------
2223@@ -123,7 +132,11 @@
2224 Reading table information for completion of table and column names
2225 You can turn off this feature to get a quicker startup with \-A
2226 Welcome to the MySQL monitor\&. Commands end with ; or \eg\&.
2227+<<<<<<< TREE
2228 Your MySQL connection id is 7 to server version: 5\&.5\&.36\-ndb\-7\&.2\&.16
2229+=======
2230+Your MySQL connection id is 7 to server version: 5\&.5\&.34\-ndb\-7\&.2\&.15
2231+>>>>>>> MERGE-SOURCE
2232 Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&.
2233 mysql> \fBSHOW TABLES;\fR
2234 +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
2235
2236=== modified file 'man/ndb_drop_table.1'
2237--- man/ndb_drop_table.1 2014-03-27 15:42:21 +0000
2238+++ man/ndb_drop_table.1 2014-05-14 14:34:53 +0000
2239@@ -1,13 +1,22 @@
2240 '\" t
2241 .\" Title: \fBndb_drop_table\fR
2242 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2243+<<<<<<< TREE
2244 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2245 .\" Date: 03/14/2014
2246+=======
2247+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2248+.\" Date: 01/13/2014
2249+>>>>>>> MERGE-SOURCE
2250 .\" Manual: MySQL Database System
2251 .\" Source: MySQL 5.5
2252 .\" Language: English
2253 .\"
2254+<<<<<<< TREE
2255 .TH "\FBNDB_DROP_TABLE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2256+=======
2257+.TH "\FBNDB_DROP_TABLE\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2258+>>>>>>> MERGE-SOURCE
2259 .\" -----------------------------------------------------------------
2260 .\" * Define some portability stuff
2261 .\" -----------------------------------------------------------------
2262
2263=== modified file 'man/ndb_error_reporter.1'
2264--- man/ndb_error_reporter.1 2014-03-27 15:42:21 +0000
2265+++ man/ndb_error_reporter.1 2014-05-14 14:34:53 +0000
2266@@ -1,13 +1,22 @@
2267 '\" t
2268 .\" Title: \fBndb_error_reporter\fR
2269 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2270+<<<<<<< TREE
2271 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2272 .\" Date: 03/14/2014
2273+=======
2274+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2275+.\" Date: 01/13/2014
2276+>>>>>>> MERGE-SOURCE
2277 .\" Manual: MySQL Database System
2278 .\" Source: MySQL 5.5
2279 .\" Language: English
2280 .\"
2281+<<<<<<< TREE
2282 .TH "\FBNDB_ERROR_REPORTE" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2283+=======
2284+.TH "\FBNDB_ERROR_REPORTE" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2285+>>>>>>> MERGE-SOURCE
2286 .\" -----------------------------------------------------------------
2287 .\" * Define some portability stuff
2288 .\" -----------------------------------------------------------------
2289
2290=== modified file 'man/ndb_index_stat.1'
2291--- man/ndb_index_stat.1 2014-03-27 15:42:21 +0000
2292+++ man/ndb_index_stat.1 2014-05-14 14:34:53 +0000
2293@@ -1,13 +1,22 @@
2294 '\" t
2295 .\" Title: \fBndb_index_stat\fR
2296 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2297+<<<<<<< TREE
2298 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2299 .\" Date: 03/14/2014
2300+=======
2301+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2302+.\" Date: 01/13/2014
2303+>>>>>>> MERGE-SOURCE
2304 .\" Manual: MySQL Database System
2305 .\" Source: MySQL 5.5
2306 .\" Language: English
2307 .\"
2308+<<<<<<< TREE
2309 .TH "\FBNDB_INDEX_STAT\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2310+=======
2311+.TH "\FBNDB_INDEX_STAT\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2312+>>>>>>> MERGE-SOURCE
2313 .\" -----------------------------------------------------------------
2314 .\" * Define some portability stuff
2315 .\" -----------------------------------------------------------------
2316
2317=== modified file 'man/ndb_mgm.1'
2318--- man/ndb_mgm.1 2014-03-27 15:42:21 +0000
2319+++ man/ndb_mgm.1 2014-05-14 14:34:53 +0000
2320@@ -1,13 +1,22 @@
2321 '\" t
2322 .\" Title: \fBndb_mgm\fR
2323 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2324+<<<<<<< TREE
2325 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2326 .\" Date: 03/14/2014
2327+=======
2328+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2329+.\" Date: 01/13/2014
2330+>>>>>>> MERGE-SOURCE
2331 .\" Manual: MySQL Database System
2332 .\" Source: MySQL 5.5
2333 .\" Language: English
2334 .\"
2335+<<<<<<< TREE
2336 .TH "\FBNDB_MGM\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2337+=======
2338+.TH "\FBNDB_MGM\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2339+>>>>>>> MERGE-SOURCE
2340 .\" -----------------------------------------------------------------
2341 .\" * Define some portability stuff
2342 .\" -----------------------------------------------------------------
2343
2344=== modified file 'man/ndb_mgmd.8'
2345--- man/ndb_mgmd.8 2014-03-27 15:42:21 +0000
2346+++ man/ndb_mgmd.8 2014-05-14 14:34:53 +0000
2347@@ -1,13 +1,22 @@
2348 '\" t
2349 .\" Title: \fBndb_mgmd\fR
2350 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2351+<<<<<<< TREE
2352 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2353 .\" Date: 03/14/2014
2354+=======
2355+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2356+.\" Date: 01/13/2014
2357+>>>>>>> MERGE-SOURCE
2358 .\" Manual: MySQL Database System
2359 .\" Source: MySQL 5.5
2360 .\" Language: English
2361 .\"
2362+<<<<<<< TREE
2363 .TH "\FBNDB_MGMD\FR" "8" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2364+=======
2365+.TH "\FBNDB_MGMD\FR" "8" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2366+>>>>>>> MERGE-SOURCE
2367 .\" -----------------------------------------------------------------
2368 .\" * Define some portability stuff
2369 .\" -----------------------------------------------------------------
2370
2371=== modified file 'man/ndb_print_backup_file.1'
2372--- man/ndb_print_backup_file.1 2014-03-27 15:42:21 +0000
2373+++ man/ndb_print_backup_file.1 2014-05-14 14:34:53 +0000
2374@@ -1,13 +1,22 @@
2375 '\" t
2376 .\" Title: \fBndb_print_backup_file\fR
2377 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2378+<<<<<<< TREE
2379 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2380 .\" Date: 03/14/2014
2381+=======
2382+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2383+.\" Date: 01/13/2014
2384+>>>>>>> MERGE-SOURCE
2385 .\" Manual: MySQL Database System
2386 .\" Source: MySQL 5.5
2387 .\" Language: English
2388 .\"
2389+<<<<<<< TREE
2390 .TH "\FBNDB_PRINT_BACKUP_" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2391+=======
2392+.TH "\FBNDB_PRINT_BACKUP_" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2393+>>>>>>> MERGE-SOURCE
2394 .\" -----------------------------------------------------------------
2395 .\" * Define some portability stuff
2396 .\" -----------------------------------------------------------------
2397
2398=== modified file 'man/ndb_print_schema_file.1'
2399--- man/ndb_print_schema_file.1 2014-03-27 15:42:21 +0000
2400+++ man/ndb_print_schema_file.1 2014-05-14 14:34:53 +0000
2401@@ -1,13 +1,22 @@
2402 '\" t
2403 .\" Title: \fBndb_print_schema_file\fR
2404 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2405+<<<<<<< TREE
2406 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2407 .\" Date: 03/14/2014
2408+=======
2409+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2410+.\" Date: 01/13/2014
2411+>>>>>>> MERGE-SOURCE
2412 .\" Manual: MySQL Database System
2413 .\" Source: MySQL 5.5
2414 .\" Language: English
2415 .\"
2416+<<<<<<< TREE
2417 .TH "\FBNDB_PRINT_SCHEMA_" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2418+=======
2419+.TH "\FBNDB_PRINT_SCHEMA_" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2420+>>>>>>> MERGE-SOURCE
2421 .\" -----------------------------------------------------------------
2422 .\" * Define some portability stuff
2423 .\" -----------------------------------------------------------------
2424
2425=== modified file 'man/ndb_print_sys_file.1'
2426--- man/ndb_print_sys_file.1 2014-03-27 15:42:21 +0000
2427+++ man/ndb_print_sys_file.1 2014-05-14 14:34:53 +0000
2428@@ -1,13 +1,22 @@
2429 '\" t
2430 .\" Title: \fBndb_print_sys_file\fR
2431 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2432+<<<<<<< TREE
2433 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2434 .\" Date: 03/14/2014
2435+=======
2436+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2437+.\" Date: 01/13/2014
2438+>>>>>>> MERGE-SOURCE
2439 .\" Manual: MySQL Database System
2440 .\" Source: MySQL 5.5
2441 .\" Language: English
2442 .\"
2443+<<<<<<< TREE
2444 .TH "\FBNDB_PRINT_SYS_FIL" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2445+=======
2446+.TH "\FBNDB_PRINT_SYS_FIL" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2447+>>>>>>> MERGE-SOURCE
2448 .\" -----------------------------------------------------------------
2449 .\" * Define some portability stuff
2450 .\" -----------------------------------------------------------------
2451
2452=== modified file 'man/ndb_restore.1'
2453--- man/ndb_restore.1 2014-03-27 15:42:21 +0000
2454+++ man/ndb_restore.1 2014-05-14 14:34:53 +0000
2455@@ -1,13 +1,22 @@
2456 '\" t
2457 .\" Title: \fBndb_restore\fR
2458 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2459+<<<<<<< TREE
2460 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2461 .\" Date: 03/14/2014
2462+=======
2463+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2464+.\" Date: 01/13/2014
2465+>>>>>>> MERGE-SOURCE
2466 .\" Manual: MySQL Database System
2467 .\" Source: MySQL 5.5
2468 .\" Language: English
2469 .\"
2470+<<<<<<< TREE
2471 .TH "\FBNDB_RESTORE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2472+=======
2473+.TH "\FBNDB_RESTORE\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2474+>>>>>>> MERGE-SOURCE
2475 .\" -----------------------------------------------------------------
2476 .\" * Define some portability stuff
2477 .\" -----------------------------------------------------------------
2478
2479=== modified file 'man/ndb_select_all.1'
2480--- man/ndb_select_all.1 2014-03-27 15:42:21 +0000
2481+++ man/ndb_select_all.1 2014-05-14 14:34:53 +0000
2482@@ -1,13 +1,22 @@
2483 '\" t
2484 .\" Title: \fBndb_select_all\fR
2485 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2486+<<<<<<< TREE
2487 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2488 .\" Date: 03/14/2014
2489+=======
2490+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2491+.\" Date: 01/13/2014
2492+>>>>>>> MERGE-SOURCE
2493 .\" Manual: MySQL Database System
2494 .\" Source: MySQL 5.5
2495 .\" Language: English
2496 .\"
2497+<<<<<<< TREE
2498 .TH "\FBNDB_SELECT_ALL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2499+=======
2500+.TH "\FBNDB_SELECT_ALL\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2501+>>>>>>> MERGE-SOURCE
2502 .\" -----------------------------------------------------------------
2503 .\" * Define some portability stuff
2504 .\" -----------------------------------------------------------------
2505
2506=== modified file 'man/ndb_select_count.1'
2507--- man/ndb_select_count.1 2014-03-27 15:42:21 +0000
2508+++ man/ndb_select_count.1 2014-05-14 14:34:53 +0000
2509@@ -1,13 +1,22 @@
2510 '\" t
2511 .\" Title: \fBndb_select_count\fR
2512 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2513+<<<<<<< TREE
2514 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2515 .\" Date: 03/14/2014
2516+=======
2517+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2518+.\" Date: 01/13/2014
2519+>>>>>>> MERGE-SOURCE
2520 .\" Manual: MySQL Database System
2521 .\" Source: MySQL 5.5
2522 .\" Language: English
2523 .\"
2524+<<<<<<< TREE
2525 .TH "\FBNDB_SELECT_COUNT\" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2526+=======
2527+.TH "\FBNDB_SELECT_COUNT\" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2528+>>>>>>> MERGE-SOURCE
2529 .\" -----------------------------------------------------------------
2530 .\" * Define some portability stuff
2531 .\" -----------------------------------------------------------------
2532
2533=== modified file 'man/ndb_show_tables.1'
2534--- man/ndb_show_tables.1 2014-03-27 15:42:21 +0000
2535+++ man/ndb_show_tables.1 2014-05-14 14:34:53 +0000
2536@@ -1,13 +1,22 @@
2537 '\" t
2538 .\" Title: \fBndb_show_tables\fR
2539 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2540+<<<<<<< TREE
2541 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2542 .\" Date: 03/14/2014
2543+=======
2544+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2545+.\" Date: 01/13/2014
2546+>>>>>>> MERGE-SOURCE
2547 .\" Manual: MySQL Database System
2548 .\" Source: MySQL 5.5
2549 .\" Language: English
2550 .\"
2551+<<<<<<< TREE
2552 .TH "\FBNDB_SHOW_TABLES\F" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2553+=======
2554+.TH "\FBNDB_SHOW_TABLES\F" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2555+>>>>>>> MERGE-SOURCE
2556 .\" -----------------------------------------------------------------
2557 .\" * Define some portability stuff
2558 .\" -----------------------------------------------------------------
2559
2560=== modified file 'man/ndb_size.pl.1'
2561--- man/ndb_size.pl.1 2014-03-27 15:42:21 +0000
2562+++ man/ndb_size.pl.1 2014-05-14 14:34:53 +0000
2563@@ -1,13 +1,22 @@
2564 '\" t
2565 .\" Title: \fBndb_size.pl\fR
2566 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2567+<<<<<<< TREE
2568 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2569 .\" Date: 03/14/2014
2570+=======
2571+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2572+.\" Date: 01/13/2014
2573+>>>>>>> MERGE-SOURCE
2574 .\" Manual: MySQL Database System
2575 .\" Source: MySQL 5.5
2576 .\" Language: English
2577 .\"
2578+<<<<<<< TREE
2579 .TH "\FBNDB_SIZE\&.PL\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2580+=======
2581+.TH "\FBNDB_SIZE\&.PL\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2582+>>>>>>> MERGE-SOURCE
2583 .\" -----------------------------------------------------------------
2584 .\" * Define some portability stuff
2585 .\" -----------------------------------------------------------------
2586
2587=== modified file 'man/ndb_waiter.1'
2588--- man/ndb_waiter.1 2014-03-27 15:42:21 +0000
2589+++ man/ndb_waiter.1 2014-05-14 14:34:53 +0000
2590@@ -1,13 +1,22 @@
2591 '\" t
2592 .\" Title: \fBndb_waiter\fR
2593 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2594+<<<<<<< TREE
2595 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2596 .\" Date: 03/14/2014
2597+=======
2598+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2599+.\" Date: 01/13/2014
2600+>>>>>>> MERGE-SOURCE
2601 .\" Manual: MySQL Database System
2602 .\" Source: MySQL 5.5
2603 .\" Language: English
2604 .\"
2605+<<<<<<< TREE
2606 .TH "\FBNDB_WAITER\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2607+=======
2608+.TH "\FBNDB_WAITER\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2609+>>>>>>> MERGE-SOURCE
2610 .\" -----------------------------------------------------------------
2611 .\" * Define some portability stuff
2612 .\" -----------------------------------------------------------------
2613
2614=== modified file 'man/ndbd.8'
2615--- man/ndbd.8 2014-03-27 15:42:21 +0000
2616+++ man/ndbd.8 2014-05-14 14:34:53 +0000
2617@@ -1,13 +1,22 @@
2618 '\" t
2619 .\" Title: \fBndbd\fR
2620 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2621+<<<<<<< TREE
2622 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2623 .\" Date: 03/14/2014
2624+=======
2625+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2626+.\" Date: 01/13/2014
2627+>>>>>>> MERGE-SOURCE
2628 .\" Manual: MySQL Database System
2629 .\" Source: MySQL 5.5
2630 .\" Language: English
2631 .\"
2632+<<<<<<< TREE
2633 .TH "\FBNDBD\FR" "8" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2634+=======
2635+.TH "\FBNDBD\FR" "8" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2636+>>>>>>> MERGE-SOURCE
2637 .\" -----------------------------------------------------------------
2638 .\" * Define some portability stuff
2639 .\" -----------------------------------------------------------------
2640
2641=== modified file 'man/ndbd_redo_log_reader.1'
2642--- man/ndbd_redo_log_reader.1 2014-03-27 15:42:21 +0000
2643+++ man/ndbd_redo_log_reader.1 2014-05-14 14:34:53 +0000
2644@@ -1,13 +1,22 @@
2645 '\" t
2646 .\" Title: \fBndbd_redo_log_reader\fR
2647 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2648+<<<<<<< TREE
2649 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2650 .\" Date: 03/14/2014
2651+=======
2652+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2653+.\" Date: 01/13/2014
2654+>>>>>>> MERGE-SOURCE
2655 .\" Manual: MySQL Database System
2656 .\" Source: MySQL 5.5
2657 .\" Language: English
2658 .\"
2659+<<<<<<< TREE
2660 .TH "\FBNDBD_REDO_LOG_REA" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2661+=======
2662+.TH "\FBNDBD_REDO_LOG_REA" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2663+>>>>>>> MERGE-SOURCE
2664 .\" -----------------------------------------------------------------
2665 .\" * Define some portability stuff
2666 .\" -----------------------------------------------------------------
2667@@ -197,6 +206,7 @@
2668 .sp 1
2669 \fB\-nocheck\fR: Do not check the log file for errors\&.
2670 .RE
2671+<<<<<<< TREE
2672 .sp
2673 .RS 4
2674 .ie n \{\
2675@@ -226,6 +236,37 @@
2676 .sp
2677 Added in MySQL Cluster NDB 7\&.2\&.15\&. (Bug #11749591, Bug #36805)
2678 .RE
2679+=======
2680+.sp
2681+.RS 4
2682+.ie n \{\
2683+\h'-04'\(bu\h'+03'\c
2684+.\}
2685+.el \{\
2686+.sp -1
2687+.IP \(bu 2.3
2688+.\}
2689+.TS
2690+allbox tab(:);
2691+l l s s
2692+l l s s.
2693+T{
2694+\fBIntroduced\fR
2695+T}:T{
2696+5\&.5\&.34\-ndb\-7\&.2\&.15
2697+T}
2698+T{
2699+\fBCommand\-Line Format\fR
2700+T}:T{
2701+\-\-help
2702+T}
2703+.TE
2704+.sp 1
2705+\fB\-\-help\fR: Print usage information\&.
2706+.sp
2707+Added in MySQL Cluster NDB 7\&.2\&.15\&. (Bug #11749591, Bug #36805)
2708+.RE
2709+>>>>>>> MERGE-SOURCE
2710 .PP
2711 Like
2712 \fBndb_print_backup_file\fR
2713
2714=== modified file 'man/ndbinfo_select_all.1'
2715--- man/ndbinfo_select_all.1 2014-03-27 15:42:21 +0000
2716+++ man/ndbinfo_select_all.1 2014-05-14 14:34:53 +0000
2717@@ -1,13 +1,22 @@
2718 '\" t
2719 .\" Title: \fBndbinfo_select_all\fR
2720 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2721+<<<<<<< TREE
2722 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2723 .\" Date: 03/14/2014
2724+=======
2725+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2726+.\" Date: 01/13/2014
2727+>>>>>>> MERGE-SOURCE
2728 .\" Manual: MySQL Database System
2729 .\" Source: MySQL 5.5
2730 .\" Language: English
2731 .\"
2732+<<<<<<< TREE
2733 .TH "\FBNDBINFO_SELECT_AL" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2734+=======
2735+.TH "\FBNDBINFO_SELECT_AL" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2736+>>>>>>> MERGE-SOURCE
2737 .\" -----------------------------------------------------------------
2738 .\" * Define some portability stuff
2739 .\" -----------------------------------------------------------------
2740
2741=== modified file 'man/ndbmtd.8'
2742--- man/ndbmtd.8 2014-03-27 15:42:21 +0000
2743+++ man/ndbmtd.8 2014-05-14 14:34:53 +0000
2744@@ -1,13 +1,22 @@
2745 '\" t
2746 .\" Title: \fBndbmtd\fR
2747 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2748+<<<<<<< TREE
2749 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2750 .\" Date: 03/14/2014
2751+=======
2752+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2753+.\" Date: 01/13/2014
2754+>>>>>>> MERGE-SOURCE
2755 .\" Manual: MySQL Database System
2756 .\" Source: MySQL 5.5
2757 .\" Language: English
2758 .\"
2759+<<<<<<< TREE
2760 .TH "\FBNDBMTD\FR" "8" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2761+=======
2762+.TH "\FBNDBMTD\FR" "8" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2763+>>>>>>> MERGE-SOURCE
2764 .\" -----------------------------------------------------------------
2765 .\" * Define some portability stuff
2766 .\" -----------------------------------------------------------------
2767
2768=== modified file 'man/perror.1'
2769--- man/perror.1 2014-03-27 15:42:21 +0000
2770+++ man/perror.1 2014-05-14 14:34:53 +0000
2771@@ -1,13 +1,22 @@
2772 '\" t
2773 .\" Title: \fBperror\fR
2774 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2775+<<<<<<< TREE
2776 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2777 .\" Date: 03/14/2014
2778+=======
2779+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2780+.\" Date: 01/13/2014
2781+>>>>>>> MERGE-SOURCE
2782 .\" Manual: MySQL Database System
2783 .\" Source: MySQL 5.5
2784 .\" Language: English
2785 .\"
2786+<<<<<<< TREE
2787 .TH "\FBPERROR\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2788+=======
2789+.TH "\FBPERROR\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2790+>>>>>>> MERGE-SOURCE
2791 .\" -----------------------------------------------------------------
2792 .\" * Define some portability stuff
2793 .\" -----------------------------------------------------------------
2794
2795=== modified file 'man/replace.1'
2796--- man/replace.1 2014-03-27 15:42:21 +0000
2797+++ man/replace.1 2014-05-14 14:34:53 +0000
2798@@ -1,13 +1,22 @@
2799 '\" t
2800 .\" Title: \fBreplace\fR
2801 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2802+<<<<<<< TREE
2803 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2804 .\" Date: 03/14/2014
2805+=======
2806+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2807+.\" Date: 01/13/2014
2808+>>>>>>> MERGE-SOURCE
2809 .\" Manual: MySQL Database System
2810 .\" Source: MySQL 5.5
2811 .\" Language: English
2812 .\"
2813+<<<<<<< TREE
2814 .TH "\FBREPLACE\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2815+=======
2816+.TH "\FBREPLACE\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2817+>>>>>>> MERGE-SOURCE
2818 .\" -----------------------------------------------------------------
2819 .\" * Define some portability stuff
2820 .\" -----------------------------------------------------------------
2821
2822=== modified file 'man/resolve_stack_dump.1'
2823--- man/resolve_stack_dump.1 2014-03-27 15:42:21 +0000
2824+++ man/resolve_stack_dump.1 2014-05-14 14:34:53 +0000
2825@@ -1,13 +1,22 @@
2826 '\" t
2827 .\" Title: \fBresolve_stack_dump\fR
2828 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2829+<<<<<<< TREE
2830 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2831 .\" Date: 03/14/2014
2832+=======
2833+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2834+.\" Date: 01/13/2014
2835+>>>>>>> MERGE-SOURCE
2836 .\" Manual: MySQL Database System
2837 .\" Source: MySQL 5.5
2838 .\" Language: English
2839 .\"
2840+<<<<<<< TREE
2841 .TH "\FBRESOLVE_STACK_DUM" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2842+=======
2843+.TH "\FBRESOLVE_STACK_DUM" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2844+>>>>>>> MERGE-SOURCE
2845 .\" -----------------------------------------------------------------
2846 .\" * Define some portability stuff
2847 .\" -----------------------------------------------------------------
2848
2849=== modified file 'man/resolveip.1'
2850--- man/resolveip.1 2014-03-27 15:42:21 +0000
2851+++ man/resolveip.1 2014-05-14 14:34:53 +0000
2852@@ -1,13 +1,22 @@
2853 '\" t
2854 .\" Title: \fBresolveip\fR
2855 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
2856+<<<<<<< TREE
2857 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2858 .\" Date: 03/14/2014
2859+=======
2860+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
2861+.\" Date: 01/13/2014
2862+>>>>>>> MERGE-SOURCE
2863 .\" Manual: MySQL Database System
2864 .\" Source: MySQL 5.5
2865 .\" Language: English
2866 .\"
2867+<<<<<<< TREE
2868 .TH "\FBRESOLVEIP\FR" "1" "03/14/2014" "MySQL 5\&.5" "MySQL Database System"
2869+=======
2870+.TH "\FBRESOLVEIP\FR" "1" "01/13/2014" "MySQL 5\&.5" "MySQL Database System"
2871+>>>>>>> MERGE-SOURCE
2872 .\" -----------------------------------------------------------------
2873 .\" * Define some portability stuff
2874 .\" -----------------------------------------------------------------
2875
2876=== modified file 'mysql-test/include/audit_log_events.inc'
2877--- mysql-test/include/audit_log_events.inc 2014-04-21 12:07:45 +0000
2878+++ mysql-test/include/audit_log_events.inc 2014-05-14 14:34:53 +0000
2879@@ -1,53 +1,110 @@
2880-# produce some events for audit log
2881-
2882-CREATE TABLE t1 (c1 INT, c2 CHAR(20));
2883---error ER_TABLE_EXISTS_ERROR
2884-CREATE TABLE t1 (c1 INT, c2 CHAR(20));
2885-INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
2886-SELECT * FROM t1;
2887---error ER_NO_SUCH_TABLE
2888-SELECT * FROM t2;
2889-DROP TABLE t1;
2890-
2891-PREPARE stmt1 FROM 'SELECT 1';
2892-EXECUTE stmt1;
2893-SHOW STATUS LIKE 'audit_log%';
2894-
2895-DEALLOCATE PREPARE stmt1;
2896-
2897-show variables like 'audit_log%';
2898-connect (con1,localhost,root,,mysql);
2899-connection default;
2900-disconnect con1;
2901---replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
2902---error ER_ACCESS_DENIED_ERROR
2903-connect (con1,localhost,no_such_user,,mysql);
2904-connection default;
2905-create table t1 (id int);
2906-create table t2 (id int);
2907-insert into t1 values (1), (2);
2908-insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
2909-select * from t1;
2910-alter table t1 rename renamed_t1;
2911---error ER_NO_SUCH_TABLE
2912-select * from t_doesnt_exist;
2913---error 1064
2914-syntax_error_query;
2915-drop table renamed_t1, t2;
2916-show variables like 'audit_log%';
2917-create database sa_db;
2918-connect (con1,localhost,root,,test);
2919-connection con1;
2920-create table t1 (id2 int);
2921-insert into t1 values (1), (2);
2922-select * from t1;
2923-drop table t1;
2924-use sa_db;
2925-create table sa_t1(id int);
2926-insert into sa_t1 values (1), (2);
2927-drop table sa_t1;
2928-drop database sa_db;
2929-connection default;
2930-create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
2931-drop user 'jeffrey'@'localhost';
2932-disconnect con1;
2933+<<<<<<< TREE
2934+# produce some events for audit log
2935+
2936+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
2937+--error ER_TABLE_EXISTS_ERROR
2938+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
2939+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
2940+SELECT * FROM t1;
2941+--error ER_NO_SUCH_TABLE
2942+SELECT * FROM t2;
2943+DROP TABLE t1;
2944+
2945+PREPARE stmt1 FROM 'SELECT 1';
2946+EXECUTE stmt1;
2947+SHOW STATUS LIKE 'audit_log%';
2948+
2949+DEALLOCATE PREPARE stmt1;
2950+
2951+show variables like 'audit_log%';
2952+connect (con1,localhost,root,,mysql);
2953+connection default;
2954+disconnect con1;
2955+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
2956+--error ER_ACCESS_DENIED_ERROR
2957+connect (con1,localhost,no_such_user,,mysql);
2958+connection default;
2959+create table t1 (id int);
2960+create table t2 (id int);
2961+insert into t1 values (1), (2);
2962+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
2963+select * from t1;
2964+alter table t1 rename renamed_t1;
2965+--error ER_NO_SUCH_TABLE
2966+select * from t_doesnt_exist;
2967+--error 1064
2968+syntax_error_query;
2969+drop table renamed_t1, t2;
2970+show variables like 'audit_log%';
2971+create database sa_db;
2972+connect (con1,localhost,root,,test);
2973+connection con1;
2974+create table t1 (id2 int);
2975+insert into t1 values (1), (2);
2976+select * from t1;
2977+drop table t1;
2978+use sa_db;
2979+create table sa_t1(id int);
2980+insert into sa_t1 values (1), (2);
2981+drop table sa_t1;
2982+drop database sa_db;
2983+connection default;
2984+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
2985+drop user 'jeffrey'@'localhost';
2986+disconnect con1;
2987+=======
2988+# produce some events for audit log
2989+
2990+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
2991+--error ER_TABLE_EXISTS_ERROR
2992+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
2993+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
2994+SELECT * FROM t1;
2995+--error ER_NO_SUCH_TABLE
2996+SELECT * FROM t2;
2997+DROP TABLE t1;
2998+
2999+PREPARE stmt1 FROM 'SELECT 1';
3000+EXECUTE stmt1;
3001+SHOW STATUS LIKE 'audit_log%';
3002+
3003+DEALLOCATE PREPARE stmt1;
3004+
3005+show variables like 'audit_log%';
3006+connect (con1,localhost,root,,mysql);
3007+connection default;
3008+disconnect con1;
3009+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
3010+--error ER_ACCESS_DENIED_ERROR
3011+connect (con1,localhost,no_such_user,,mysql);
3012+connection default;
3013+create table t1 (id int);
3014+create table t2 (id int);
3015+insert into t1 values (1), (2);
3016+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
3017+select * from t1;
3018+alter table t1 rename renamed_t1;
3019+--error ER_NO_SUCH_TABLE
3020+select * from t_doesnt_exist;
3021+--error 1064
3022+syntax_error_query;
3023+drop table renamed_t1, t2;
3024+show variables like 'audit_log%';
3025+create database sa_db;
3026+connect (con1,localhost,root,,test);
3027+connection con1;
3028+create table t1 (id2 int);
3029+insert into t1 values (1), (2);
3030+select * from t1;
3031+drop table t1;
3032+use sa_db;
3033+create table sa_t1(id int);
3034+insert into sa_t1 values (1), (2);
3035+drop table sa_t1;
3036+drop database sa_db;
3037+connection default;
3038+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
3039+drop user 'jeffrey'@'localhost';
3040+select '&;&&&""""<><<>>>>';
3041+disconnect con1;
3042+>>>>>>> MERGE-SOURCE
3043
3044=== modified file 'mysql-test/mysql-test-run.pl'
3045=== modified file 'mysql-test/r/audit_log.result'
3046--- mysql-test/r/audit_log.result 2014-04-21 12:07:45 +0000
3047+++ mysql-test/r/audit_log.result 2014-05-14 14:34:53 +0000
3048@@ -1,140 +1,289 @@
3049-CREATE TABLE t1 (c1 INT, c2 CHAR(20));
3050-CREATE TABLE t1 (c1 INT, c2 CHAR(20));
3051-ERROR 42S01: Table 't1' already exists
3052-INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
3053-SELECT * FROM t1;
3054-c1 c2
3055-1 a
3056-2 b
3057-3 c
3058-SELECT * FROM t2;
3059-ERROR 42S02: Table 'test.t2' doesn't exist
3060-DROP TABLE t1;
3061-PREPARE stmt1 FROM 'SELECT 1';
3062-EXECUTE stmt1;
3063-1
3064-1
3065-SHOW STATUS LIKE 'audit_log%';
3066-Variable_name Value
3067-DEALLOCATE PREPARE stmt1;
3068-show variables like 'audit_log%';
3069-Variable_name Value
3070-audit_log_buffer_size 4096
3071-audit_log_file test_audit.log
3072-audit_log_flush OFF
3073-audit_log_format OLD
3074-audit_log_policy ALL
3075-audit_log_rotate_on_size 0
3076-audit_log_rotations 0
3077-audit_log_strategy ASYNCHRONOUS
3078-connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
3079-ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
3080-create table t1 (id int);
3081-create table t2 (id int);
3082-insert into t1 values (1), (2);
3083-insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
3084-select * from t1;
3085-id
3086-1
3087-2
3088-alter table t1 rename renamed_t1;
3089-select * from t_doesnt_exist;
3090-ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
3091-syntax_error_query;
3092-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
3093-drop table renamed_t1, t2;
3094-show variables like 'audit_log%';
3095-Variable_name Value
3096-audit_log_buffer_size 4096
3097-audit_log_file test_audit.log
3098-audit_log_flush OFF
3099-audit_log_format OLD
3100-audit_log_policy ALL
3101-audit_log_rotate_on_size 0
3102-audit_log_rotations 0
3103-audit_log_strategy ASYNCHRONOUS
3104-create database sa_db;
3105-create table t1 (id2 int);
3106-insert into t1 values (1), (2);
3107-select * from t1;
3108-id2
3109-1
3110-2
3111-drop table t1;
3112-use sa_db;
3113-create table sa_t1(id int);
3114-insert into sa_t1 values (1), (2);
3115-drop table sa_t1;
3116-drop database sa_db;
3117-create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
3118-drop user 'jeffrey'@'localhost';
3119-CREATE TABLE t1 (c1 INT, c2 CHAR(20));
3120-CREATE TABLE t1 (c1 INT, c2 CHAR(20));
3121-ERROR 42S01: Table 't1' already exists
3122-INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
3123-SELECT * FROM t1;
3124-c1 c2
3125-1 a
3126-2 b
3127-3 c
3128-SELECT * FROM t2;
3129-ERROR 42S02: Table 'test.t2' doesn't exist
3130-DROP TABLE t1;
3131-PREPARE stmt1 FROM 'SELECT 1';
3132-EXECUTE stmt1;
3133-1
3134-1
3135-SHOW STATUS LIKE 'audit_log%';
3136-Variable_name Value
3137-DEALLOCATE PREPARE stmt1;
3138-show variables like 'audit_log%';
3139-Variable_name Value
3140-audit_log_buffer_size 4096
3141-audit_log_file test_audit.log
3142-audit_log_flush OFF
3143-audit_log_format NEW
3144-audit_log_policy LOGINS
3145-audit_log_rotate_on_size 0
3146-audit_log_rotations 0
3147-audit_log_strategy SYNCHRONOUS
3148-connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
3149-ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
3150-create table t1 (id int);
3151-create table t2 (id int);
3152-insert into t1 values (1), (2);
3153-insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
3154-select * from t1;
3155-id
3156-1
3157-2
3158-alter table t1 rename renamed_t1;
3159-select * from t_doesnt_exist;
3160-ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
3161-syntax_error_query;
3162-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
3163-drop table renamed_t1, t2;
3164-show variables like 'audit_log%';
3165-Variable_name Value
3166-audit_log_buffer_size 4096
3167-audit_log_file test_audit.log
3168-audit_log_flush OFF
3169-audit_log_format NEW
3170-audit_log_policy LOGINS
3171-audit_log_rotate_on_size 0
3172-audit_log_rotations 0
3173-audit_log_strategy SYNCHRONOUS
3174-create database sa_db;
3175-create table t1 (id2 int);
3176-insert into t1 values (1), (2);
3177-select * from t1;
3178-id2
3179-1
3180-2
3181-drop table t1;
3182-use sa_db;
3183-create table sa_t1(id int);
3184-insert into sa_t1 values (1), (2);
3185-drop table sa_t1;
3186-drop database sa_db;
3187-create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
3188-drop user 'jeffrey'@'localhost';
3189+<<<<<<< TREE
3190+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
3191+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
3192+ERROR 42S01: Table 't1' already exists
3193+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
3194+SELECT * FROM t1;
3195+c1 c2
3196+1 a
3197+2 b
3198+3 c
3199+SELECT * FROM t2;
3200+ERROR 42S02: Table 'test.t2' doesn't exist
3201+DROP TABLE t1;
3202+PREPARE stmt1 FROM 'SELECT 1';
3203+EXECUTE stmt1;
3204+1
3205+1
3206+SHOW STATUS LIKE 'audit_log%';
3207+Variable_name Value
3208+DEALLOCATE PREPARE stmt1;
3209+show variables like 'audit_log%';
3210+Variable_name Value
3211+audit_log_buffer_size 4096
3212+audit_log_file test_audit.log
3213+audit_log_flush OFF
3214+audit_log_format OLD
3215+audit_log_policy ALL
3216+audit_log_rotate_on_size 0
3217+audit_log_rotations 0
3218+audit_log_strategy ASYNCHRONOUS
3219+connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
3220+ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
3221+create table t1 (id int);
3222+create table t2 (id int);
3223+insert into t1 values (1), (2);
3224+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
3225+select * from t1;
3226+id
3227+1
3228+2
3229+alter table t1 rename renamed_t1;
3230+select * from t_doesnt_exist;
3231+ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
3232+syntax_error_query;
3233+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
3234+drop table renamed_t1, t2;
3235+show variables like 'audit_log%';
3236+Variable_name Value
3237+audit_log_buffer_size 4096
3238+audit_log_file test_audit.log
3239+audit_log_flush OFF
3240+audit_log_format OLD
3241+audit_log_policy ALL
3242+audit_log_rotate_on_size 0
3243+audit_log_rotations 0
3244+audit_log_strategy ASYNCHRONOUS
3245+create database sa_db;
3246+create table t1 (id2 int);
3247+insert into t1 values (1), (2);
3248+select * from t1;
3249+id2
3250+1
3251+2
3252+drop table t1;
3253+use sa_db;
3254+create table sa_t1(id int);
3255+insert into sa_t1 values (1), (2);
3256+drop table sa_t1;
3257+drop database sa_db;
3258+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
3259+drop user 'jeffrey'@'localhost';
3260+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
3261+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
3262+ERROR 42S01: Table 't1' already exists
3263+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
3264+SELECT * FROM t1;
3265+c1 c2
3266+1 a
3267+2 b
3268+3 c
3269+SELECT * FROM t2;
3270+ERROR 42S02: Table 'test.t2' doesn't exist
3271+DROP TABLE t1;
3272+PREPARE stmt1 FROM 'SELECT 1';
3273+EXECUTE stmt1;
3274+1
3275+1
3276+SHOW STATUS LIKE 'audit_log%';
3277+Variable_name Value
3278+DEALLOCATE PREPARE stmt1;
3279+show variables like 'audit_log%';
3280+Variable_name Value
3281+audit_log_buffer_size 4096
3282+audit_log_file test_audit.log
3283+audit_log_flush OFF
3284+audit_log_format NEW
3285+audit_log_policy LOGINS
3286+audit_log_rotate_on_size 0
3287+audit_log_rotations 0
3288+audit_log_strategy SYNCHRONOUS
3289+connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
3290+ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
3291+create table t1 (id int);
3292+create table t2 (id int);
3293+insert into t1 values (1), (2);
3294+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
3295+select * from t1;
3296+id
3297+1
3298+2
3299+alter table t1 rename renamed_t1;
3300+select * from t_doesnt_exist;
3301+ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
3302+syntax_error_query;
3303+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
3304+drop table renamed_t1, t2;
3305+show variables like 'audit_log%';
3306+Variable_name Value
3307+audit_log_buffer_size 4096
3308+audit_log_file test_audit.log
3309+audit_log_flush OFF
3310+audit_log_format NEW
3311+audit_log_policy LOGINS
3312+audit_log_rotate_on_size 0
3313+audit_log_rotations 0
3314+audit_log_strategy SYNCHRONOUS
3315+create database sa_db;
3316+create table t1 (id2 int);
3317+insert into t1 values (1), (2);
3318+select * from t1;
3319+id2
3320+1
3321+2
3322+drop table t1;
3323+use sa_db;
3324+create table sa_t1(id int);
3325+insert into sa_t1 values (1), (2);
3326+drop table sa_t1;
3327+drop database sa_db;
3328+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
3329+drop user 'jeffrey'@'localhost';
3330+=======
3331+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
3332+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
3333+ERROR 42S01: Table 't1' already exists
3334+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
3335+SELECT * FROM t1;
3336+c1 c2
3337+1 a
3338+2 b
3339+3 c
3340+SELECT * FROM t2;
3341+ERROR 42S02: Table 'test.t2' doesn't exist
3342+DROP TABLE t1;
3343+PREPARE stmt1 FROM 'SELECT 1';
3344+EXECUTE stmt1;
3345+1
3346+1
3347+SHOW STATUS LIKE 'audit_log%';
3348+Variable_name Value
3349+DEALLOCATE PREPARE stmt1;
3350+show variables like 'audit_log%';
3351+Variable_name Value
3352+audit_log_buffer_size 4096
3353+audit_log_file test_audit.log
3354+audit_log_flush OFF
3355+audit_log_format OLD
3356+audit_log_policy ALL
3357+audit_log_rotate_on_size 0
3358+audit_log_rotations 0
3359+audit_log_strategy ASYNCHRONOUS
3360+connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
3361+ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
3362+create table t1 (id int);
3363+create table t2 (id int);
3364+insert into t1 values (1), (2);
3365+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
3366+select * from t1;
3367+id
3368+1
3369+2
3370+alter table t1 rename renamed_t1;
3371+select * from t_doesnt_exist;
3372+ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
3373+syntax_error_query;
3374+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
3375+drop table renamed_t1, t2;
3376+show variables like 'audit_log%';
3377+Variable_name Value
3378+audit_log_buffer_size 4096
3379+audit_log_file test_audit.log
3380+audit_log_flush OFF
3381+audit_log_format OLD
3382+audit_log_policy ALL
3383+audit_log_rotate_on_size 0
3384+audit_log_rotations 0
3385+audit_log_strategy ASYNCHRONOUS
3386+create database sa_db;
3387+create table t1 (id2 int);
3388+insert into t1 values (1), (2);
3389+select * from t1;
3390+id2
3391+1
3392+2
3393+drop table t1;
3394+use sa_db;
3395+create table sa_t1(id int);
3396+insert into sa_t1 values (1), (2);
3397+drop table sa_t1;
3398+drop database sa_db;
3399+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
3400+drop user 'jeffrey'@'localhost';
3401+select '&;&&&""""<><<>>>>';
3402+&;&&&""""<><<>>>>
3403+&;&&&""""<><<>>>>
3404+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
3405+CREATE TABLE t1 (c1 INT, c2 CHAR(20));
3406+ERROR 42S01: Table 't1' already exists
3407+INSERT INTO t1 VALUES (1,'a'),(2,'b'),(3,'c');
3408+SELECT * FROM t1;
3409+c1 c2
3410+1 a
3411+2 b
3412+3 c
3413+SELECT * FROM t2;
3414+ERROR 42S02: Table 'test.t2' doesn't exist
3415+DROP TABLE t1;
3416+PREPARE stmt1 FROM 'SELECT 1';
3417+EXECUTE stmt1;
3418+1
3419+1
3420+SHOW STATUS LIKE 'audit_log%';
3421+Variable_name Value
3422+DEALLOCATE PREPARE stmt1;
3423+show variables like 'audit_log%';
3424+Variable_name Value
3425+audit_log_buffer_size 4096
3426+audit_log_file test_audit.log
3427+audit_log_flush OFF
3428+audit_log_format NEW
3429+audit_log_policy LOGINS
3430+audit_log_rotate_on_size 0
3431+audit_log_rotations 0
3432+audit_log_strategy SYNCHRONOUS
3433+connect(localhost,no_such_user,,mysql,MASTER_PORT,MASTER_SOCKET);
3434+ERROR 28000: Access denied for user 'no_such_user'@'localhost' (using password: NO)
3435+create table t1 (id int);
3436+create table t2 (id int);
3437+insert into t1 values (1), (2);
3438+insert into t2 values (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2), (1), (2);
3439+select * from t1;
3440+id
3441+1
3442+2
3443+alter table t1 rename renamed_t1;
3444+select * from t_doesnt_exist;
3445+ERROR 42S02: Table 'test.t_doesnt_exist' doesn't exist
3446+syntax_error_query;
3447+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'syntax_error_query' at line 1
3448+drop table renamed_t1, t2;
3449+show variables like 'audit_log%';
3450+Variable_name Value
3451+audit_log_buffer_size 4096
3452+audit_log_file test_audit.log
3453+audit_log_flush OFF
3454+audit_log_format NEW
3455+audit_log_policy LOGINS
3456+audit_log_rotate_on_size 0
3457+audit_log_rotations 0
3458+audit_log_strategy SYNCHRONOUS
3459+create database sa_db;
3460+create table t1 (id2 int);
3461+insert into t1 values (1), (2);
3462+select * from t1;
3463+id2
3464+1
3465+2
3466+drop table t1;
3467+use sa_db;
3468+create table sa_t1(id int);
3469+insert into sa_t1 values (1), (2);
3470+drop table sa_t1;
3471+drop database sa_db;
3472+create user 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';
3473+drop user 'jeffrey'@'localhost';
3474+select '&;&&&""""<><<>>>>';
3475+&;&&&""""<><<>>>>
3476+&;&&&""""<><<>>>>
3477+>>>>>>> MERGE-SOURCE
3478
3479=== modified file 'mysys/my_libwrap.c'
3480--- mysys/my_libwrap.c 2014-02-17 12:49:04 +0000
3481+++ mysys/my_libwrap.c 2014-05-14 14:34:53 +0000
3482@@ -1,5 +1,9 @@
3483+<<<<<<< TREE
3484 /* Copyright (c) 2003, 2006 MySQL AB
3485 Use is subject to license terms
3486+=======
3487+/* Copyright (c) 2003, 2006 MySQL AB
3488+>>>>>>> MERGE-SOURCE
3489
3490 This program is free software; you can redistribute it and/or modify
3491 it under the terms of the GNU General Public License as published by
3492
3493=== modified file 'packaging/rpm-oel/CMakeLists.txt'
3494--- packaging/rpm-oel/CMakeLists.txt 2014-02-11 07:27:00 +0000
3495+++ packaging/rpm-oel/CMakeLists.txt 2014-05-14 14:34:53 +0000
3496@@ -1,3 +1,4 @@
3497+<<<<<<< TREE
3498 # Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
3499 #
3500 # This program is free software; you can redistribute it and/or modify
3501@@ -34,3 +35,41 @@
3502 ENDFOREACH()
3503 ENDIF()
3504
3505+=======
3506+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
3507+#
3508+# This program is free software; you can redistribute it and/or modify
3509+# it under the terms of the GNU General Public License as published by
3510+# the Free Software Foundation; version 2 of the License.
3511+#
3512+# This program is distributed in the hope that it will be useful,
3513+# but WITHOUT ANY WARRANTY; without even the implied warranty of
3514+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3515+# GNU General Public License for more details.
3516+#
3517+# You should have received a copy of the GNU General Public License
3518+# along with this program; if not, write to the Free Software
3519+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
3520+
3521+
3522+IF(UNIX)
3523+ SET(prefix ${CMAKE_INSTALL_PREFIX})
3524+
3525+ SET(SPECFILENAME "mysql.spec")
3526+ IF("${VERSION}" MATCHES "-ndb-")
3527+ STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
3528+ SET(SPECFILENAME "mysql-cluster-${NDBVERSION}.spec")
3529+ ENDIF()
3530+
3531+ # Left in current directory, to be taken during build
3532+ CONFIGURE_FILE(mysql.spec.in ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
3533+
3534+ FOREACH(fedfile my.cnf my_config.h mysql_config.sh
3535+ mysqld.service mysql-systemd-start mysql.conf
3536+ filter-requires.sh filter-provides.sh
3537+ mysql-embedded-check.c mysql.init)
3538+ CONFIGURE_FILE(${fedfile} ${CMAKE_CURRENT_BINARY_DIR}/${fedfile} COPYONLY)
3539+ ENDFOREACH()
3540+ENDIF()
3541+
3542+>>>>>>> MERGE-SOURCE
3543
3544=== added file 'packaging/rpm-oel/mysql-embedded-check.c'
3545--- packaging/rpm-oel/mysql-embedded-check.c 1970-01-01 00:00:00 +0000
3546+++ packaging/rpm-oel/mysql-embedded-check.c 2014-05-14 14:34:53 +0000
3547@@ -0,0 +1,26 @@
3548+/* simple test program to see if we can link the embedded server library */
3549+
3550+#include <stdio.h>
3551+#include <stdlib.h>
3552+#include <stdarg.h>
3553+
3554+#include "mysql.h"
3555+
3556+MYSQL *mysql;
3557+
3558+static char *server_options[] = \
3559+ { "mysql_test", "--defaults-file=my.cnf", NULL };
3560+int num_elements = (sizeof(server_options) / sizeof(char *)) - 1;
3561+
3562+static char *server_groups[] = { "libmysqld_server",
3563+ "libmysqld_client", NULL };
3564+
3565+int main(int argc, char **argv)
3566+{
3567+ mysql_library_init(num_elements, server_options, server_groups);
3568+ mysql = mysql_init(NULL);
3569+ mysql_close(mysql);
3570+ mysql_library_end();
3571+
3572+ return 0;
3573+}
3574
3575=== modified file 'packaging/rpm-oel/mysql.spec.in'
3576--- packaging/rpm-oel/mysql.spec.in 2014-03-14 18:46:27 +0000
3577+++ packaging/rpm-oel/mysql.spec.in 2014-05-14 14:34:53 +0000
3578@@ -1,3 +1,4 @@
3579+<<<<<<< TREE
3580 # Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
3581 #
3582 # This program is free software; you can redistribute it and/or modify
3583@@ -1589,3 +1590,1561 @@
3584 - A developers changelog for MySQL is available in the source RPM. And
3585 there is a history of major user visible changed in the Reference
3586 Manual. Only RPM specific changes will be documented here.
3587+=======
3588+# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
3589+#
3590+# This program is free software; you can redistribute it and/or modify
3591+# it under the terms of the GNU General Public License as published by
3592+# the Free Software Foundation; version 2 of the License.
3593+#
3594+# This program is distributed in the hope that it will be useful,
3595+# but WITHOUT ANY WARRANTY; without even the implied warranty of
3596+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3597+# GNU General Public License for more details.
3598+#
3599+# You should have received a copy of the GNU General Public License
3600+# along with this program; see the file COPYING. If not, write to the
3601+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
3602+# MA 02110-1301 USA.
3603+
3604+
3605+# NOTE: "vendor" is used in upgrade/downgrade check, so you can't
3606+# change these, has to be exactly as is.
3607+
3608+%global mysql_vendor Oracle and/or its affiliates
3609+%global mysqldatadir /var/lib/mysql
3610+
3611+# By default, a build will include the bundeled "yaSSL" library for SSL.
3612+%{?with_ssl: %global ssl_option -DWITH_SSL=%{with_ssl}}
3613+
3614+# Regression tests may take a long time, override the default to skip them
3615+%{!?runselftest:%global runselftest 0}
3616+
3617+%{!?with_systemd: %global systemd 0}
3618+%{!?with_debuginfo: %global nodebuginfo 1}
3619+%{!?product_suffix: %global product_suffix community}
3620+%{!?feature_set: %global feature_set community}
3621+%{!?compilation_comment_release: %global compilation_comment_release MySQL Community Server - (GPL)}
3622+%{!?compilation_comment_debug: %global compilation_comment_debug MySQL Community Server - Debug (GPL)}
3623+%{!?src_base: %global src_base mysql}
3624+
3625+%global libmysqld_so_major 0
3626+%global libmysqld_so_long 0.0.1
3627+
3628+# Version for compat libs
3629+%global compatver 5.1.72
3630+
3631+%global src_dir %{src_base}-%{version}
3632+
3633+# No debuginfo for now, ships /usr/sbin/mysqld-debug and libmysqlcliet-debug.a
3634+%if 0%{?nodebuginfo}
3635+%global _enable_debug_package 0
3636+%global debug_package %{nil}
3637+%global __os_install_post /usr/lib/rpm/brp-compress %{nil}
3638+%endif
3639+
3640+# multiarch
3641+%global multiarchs ppc %{power64} %{ix86} x86_64 %{sparc}
3642+
3643+%if 0%{?commercial}
3644+%global license_files_server %{src_dir}/LICENSE.mysql
3645+%global license_type Commercial
3646+%else
3647+%global license_files_server %{src_dir}/COPYING %{src_dir}/README
3648+%global license_type GPLv2
3649+%endif
3650+
3651+
3652+Name: mysql-%{product_suffix}
3653+Summary: A very fast and reliable SQL database server
3654+Group: Applications/Databases
3655+Version: @VERSION@
3656+Release: 1%{?dist}
3657+License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
3658+Source0: https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
3659+URL: http://www.mysql.com/
3660+Packager: MySQL Release Engineering <mysql-build@oss.oracle.com>
3661+Vendor: %{mysql_vendor}
3662+Source1: mysql-systemd-start
3663+Source2: mysqld.service
3664+Source3: mysql.conf
3665+Source4: my_config.h
3666+Source5: mysql_config.sh
3667+Source6: mysql-embedded-check.c
3668+Source7: https://cdn.mysql.com/Downloads/MySQL-5.5/mysql-%{compatver}.tar.gz
3669+Source90: filter-provides.sh
3670+Source91: filter-requires.sh
3671+BuildRequires: cmake
3672+BuildRequires: perl
3673+BuildRequires: time
3674+BuildRequires: libaio-devel
3675+BuildRequires: ncurses-devel
3676+BuildRequires: openssl-devel
3677+BuildRequires: zlib-devel
3678+%if 0%{?systemd}
3679+BuildRequires: systemd-units
3680+%endif
3681+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
3682+
3683+# https://fedoraproject.org/wiki/EPEL:Packaging#Generic_Filtering_on_EPEL6
3684+%global __perl_provides %{SOURCE90}
3685+%global __perl_requires %{SOURCE91}
3686+
3687+%description
3688+The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
3689+and robust SQL (Structured Query Language) database server. MySQL Server
3690+is intended for mission-critical, heavy-load production systems as well
3691+as for embedding into mass-deployed software. MySQL is a trademark of
3692+%{mysql_vendor}
3693+
3694+The MySQL software has Dual Licensing, which means you can use the MySQL
3695+software free of charge under the GNU General Public License
3696+(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
3697+licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
3698+the GPL. See the chapter "Licensing and Support" in the manual for
3699+further info.
3700+
3701+The MySQL web site (http://www.mysql.com/) provides the latest
3702+news and information about the MySQL software. Also please see the
3703+documentation and the manual for more information.
3704+
3705+%package server
3706+Summary: A very fast and reliable SQL database server
3707+Group: Applications/Databases
3708+Requires: coreutils
3709+Requires: grep
3710+Requires: procps
3711+Requires: shadow-utils
3712+Requires: net-tools
3713+%if 0%{?commercial}
3714+Obsoletes: mysql-community-server < %{version}-%{release}
3715+Requires: mysql-enterprise-client%{?_isa} = %{version}-%{release}
3716+Requires: mysql-enterprise-common%{?_isa} = %{version}-%{release}
3717+%else
3718+Requires: mysql-community-client%{?_isa} = %{version}-%{release}
3719+Requires: mysql-community-common%{?_isa} = %{version}-%{release}
3720+%endif
3721+Obsoletes: mysql-server < %{version}-%{release}
3722+Provides: mysql-server = %{version}-%{release}
3723+Provides: mysql-server%{?_isa} = %{version}-%{release}
3724+%if 0%{?systemd}
3725+Requires(post): systemd
3726+Requires(preun): systemd
3727+Requires(postun): systemd
3728+%else
3729+Requires(post): /sbin/chkconfig
3730+Requires(preun): /sbin/chkconfig
3731+Requires(preun): /sbin/service
3732+%endif
3733+
3734+%description server
3735+The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
3736+and robust SQL (Structured Query Language) database server. MySQL Server
3737+is intended for mission-critical, heavy-load production systems as well
3738+as for embedding into mass-deployed software. MySQL is a trademark of
3739+%{mysql_vendor}
3740+
3741+The MySQL software has Dual Licensing, which means you can use the MySQL
3742+software free of charge under the GNU General Public License
3743+(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
3744+licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
3745+the GPL. See the chapter "Licensing and Support" in the manual for
3746+further info.
3747+
3748+The MySQL web site (http://www.mysql.com/) provides the latest news and
3749+information about the MySQL software. Also please see the documentation
3750+and the manual for more information.
3751+
3752+This package includes the MySQL server binary as well as related utilities
3753+to run and administer a MySQL server.
3754+
3755+%package client
3756+Summary: MySQL database client applications and tools
3757+Group: Applications/Databases
3758+%if 0%{?commercial}
3759+Obsoletes: mysql-community-client < %{version}-%{release}
3760+Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release}
3761+%else
3762+Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
3763+%endif
3764+Obsoletes: mysql < %{version}-%{release}
3765+Provides: mysql = %{version}-%{release}
3766+Provides: mysql%{?_isa} = %{version}-%{release}
3767+
3768+%description client
3769+This package contains the standard MySQL clients and administration
3770+tools.
3771+
3772+%package common
3773+Summary: MySQL database common files for server and client libs
3774+Group: Applications/Databases
3775+%if 0%{?commercial}
3776+Obsoletes: mysql-community-common < %{version}-%{release}
3777+%endif
3778+Provides: mysql-common = %{version}-%{release}
3779+Provides: mysql-common%{?_isa} = %{version}-%{release}
3780+
3781+%description common
3782+This packages contains common files needed by MySQL client library,
3783+MySQL database server, and MySQL embedded server.
3784+
3785+
3786+%package test
3787+Summary: Test suite for the MySQL database server
3788+Group: Applications/Databases
3789+%if 0%{?commercial}
3790+Obsoletes: mysql-community-test < %{version}-%{release}
3791+Requires: mysql-enterprise-server%{?_isa} = %{version}-%{release}
3792+%else
3793+Requires: mysql-community-server%{?_isa} = %{version}-%{release}
3794+%endif
3795+Obsoletes: mysql-test < %{version}-%{release}
3796+Provides: mysql-test = %{version}-%{release}
3797+Provides: mysql-test%{?_isa} = %{version}-%{release}
3798+
3799+
3800+%description test
3801+This package contains the MySQL regression test suite for MySQL
3802+database server.
3803+
3804+
3805+%package devel
3806+Summary: Development header files and libraries for MySQL database client applications
3807+Group: Applications/Databases
3808+%if 0%{?commercial}
3809+Obsoletes: mysql-community-devel < %{version}-%{release}
3810+Requires: mysql-enterprise-libs%{?_isa} = %{version}-%{release}
3811+%else
3812+Requires: mysql-community-libs%{?_isa} = %{version}-%{release}
3813+%endif
3814+Obsoletes: mysql-devel < %{version}-%{release}
3815+Provides: mysql-devel = %{version}-%{release}
3816+Provides: mysql-devel%{?_isa} = %{version}-%{release}
3817+
3818+%description devel
3819+This package contains the development header files and libraries necessary
3820+to develop MySQL client applications.
3821+
3822+%package libs
3823+Summary: Shared libraries for MySQL database client applications
3824+Group: Applications/Databases
3825+%if 0%{?commercial}
3826+Obsoletes: mysql-community-libs < %{version}-%{release}
3827+Requires: mysql-enterprise-common%{?_isa} = %{version}-%{release}
3828+%else
3829+Requires: mysql-community-common%{?_isa} = %{version}-%{release}
3830+%endif
3831+Obsoletes: mysql-libs < %{version}-%{release}
3832+Provides: mysql-libs = %{version}-%{release}
3833+Provides: mysql-libs%{?_isa} = %{version}-%{release}
3834+
3835+%description libs
3836+This package contains the shared libraries for MySQL client
3837+applications.
3838+
3839+%package libs-compat
3840+Summary: Shared compat libraries for MySQL 5.1 database client applications
3841+Group: Applications/Databases
3842+Obsoletes: mysql-libs-compat < %{version}-%{release}
3843+Provides: mysql-libs-compat = %{version}-%{release}
3844+Provides: mysql-libs-compat%{?_isa} = %{version}-%{release}
3845+
3846+%description libs-compat
3847+This package contains the shared compat libraries for MySQL 5.1 client
3848+applications.
3849+
3850+%package embedded
3851+Summary: MySQL embedded library
3852+Group: Applications/Databases
3853+%if 0%{?commercial}
3854+Obsoletes: mysql-community-embedded < %{version}-%{release}
3855+Requires: mysql-enterprise-common%{?_isa} = %{version}-%{release}
3856+%else
3857+Requires: mysql-community-common%{?_isa} = %{version}-%{release}
3858+%endif
3859+Obsoletes: mysql-embedded < %{version}-%{release}
3860+Provides: mysql-embedded = %{version}-%{release}
3861+Provides: mysql-emdedded%{?_isa} = %{version}-%{release}
3862+
3863+%description embedded
3864+This package contains the mysql server as an embedded library.
3865+
3866+The embedded MySQL server library makes it possible to run a full-featured
3867+MySQL server inside the client application. The main benefits are increased
3868+speed and more simple management for embedded applications.
3869+
3870+The API is identical for the embedded MySQL version and the
3871+client/server version.
3872+
3873+For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
3874+
3875+%package embedded-devel
3876+Summary: Development header files and libraries for MySQL as an embeddable library
3877+Group: Applications/Databases
3878+%if 0%{?commercial}
3879+Obsoletes: mysql-community-embedded-devel < %{version}-%{release}
3880+Requires: mysql-enterprise-devel%{?_isa} = %{version}-%{release}
3881+Requires: mysql-enterprise-embedded%{?_isa} = %{version}-%{release}
3882+%else
3883+Requires: mysql-community-devel%{?_isa} = %{version}-%{release}
3884+Requires: mysql-community-embedded%{?_isa} = %{version}-%{release}
3885+%endif
3886+Obsoletes: mysql-embedded-devel < %{version}-%{release}
3887+Provides: mysql-embedded-devel = %{version}-%{release}
3888+Provides: mysql-embedded-devel%{?_isa} = %{version}-%{release}
3889+
3890+%description embedded-devel
3891+This package contains files needed for developing applicatison using
3892+the embedded version of the MySQL server.
3893+
3894+%prep
3895+%setup -q -T -a 0 -a 7 -c -n %{src_dir}
3896+cd %{src_dir}
3897+
3898+%build
3899+# Fail quickly and obviously if user tries to build as root
3900+%if 0%{?runselftest}
3901+if [ "x$(id -u)" = "x0" ] ; then
3902+ echo "The MySQL regression tests may fail if run as root."
3903+ echo "If you really need to build the RPM as root, use"
3904+ echo "--define='runselftest 0' to skip the regression tests."
3905+ exit 1
3906+fi
3907+%endif
3908+
3909+# Build compat libs
3910+(
3911+export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fno-strict-aliasing -fwrapv"
3912+export CXXFLAGS="$CFLAGS -felide-constructors -fno-rtti -fno-exceptions"
3913+pushd mysql-%{compatver}
3914+%configure \
3915+ --with-readline \
3916+ --with-ssl=%{_prefix} \
3917+ --without-debug \
3918+ --enable-shared \
3919+ --with-embedded-server \
3920+ --localstatedir=/var/lib/mysql \
3921+ --with-unix-socket-path=/var/lib/mysql/mysql.sock \
3922+ --with-mysqld-user="mysql" \
3923+ --with-extra-charsets=all \
3924+ --with-big-tables \
3925+ --with-pic \
3926+ --with-plugin-innobase \
3927+ --with-plugin-innodb_plugin \
3928+ --with-plugin-partition \
3929+ --enable-local-infile \
3930+ --enable-largefile \
3931+ --enable-thread-safe-client \
3932+ --disable-dependency-tracking
3933+make %{?_smp_mflags}
3934+popd
3935+)
3936+
3937+export CFLAGS="%{optflags}"
3938+export CXXFLAGS="%{optflags}"
3939+
3940+# Build debug versions of mysqld and libmysqld.a
3941+mkdir debug
3942+(
3943+ cd debug
3944+ # Attempt to remove any optimisation flags from the debug build
3945+ CFLAGS=$(echo "${CFLAGS}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
3946+ CXXFLAGS=$(echo "${CFLAGS}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
3947+ cmake ../%{src_dir} \
3948+ -DBUILD_CONFIG=mysql_release \
3949+ -DINSTALL_LAYOUT=RPM \
3950+ -DCMAKE_BUILD_TYPE=Debug \
3951+ -DWITH_INNODB_MEMCACHED=1 \
3952+ -DINSTALL_LIBDIR="%{_lib}/mysql" \
3953+ -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
3954+ -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
3955+ -DFEATURE_SET="%{feature_set}" \
3956+ %{?ssl_option} \
3957+ -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
3958+ -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
3959+ echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
3960+ make %{?_smp_mflags} VERBOSE=1
3961+)
3962+
3963+# Build full release
3964+mkdir release
3965+(
3966+ cd release
3967+ cmake ../%{src_dir} \
3968+ -DBUILD_CONFIG=mysql_release \
3969+ -DINSTALL_LAYOUT=RPM \
3970+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
3971+ -DWITH_INNODB_MEMCACHED=1 \
3972+ -DINSTALL_LIBDIR="%{_lib}/mysql" \
3973+ -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
3974+ -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
3975+ -DFEATURE_SET="%{feature_set}" \
3976+ %{?ssl_option} \
3977+ -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
3978+ -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
3979+ echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
3980+ make %{?_smp_mflags} VERBOSE=1
3981+
3982+# Need to build libmysqld.so for distros
3983+mkdir libmysqld/work
3984+pushd libmysqld/work
3985+
3986+ar -x ../libmysqld.a
3987+[ -e ../../extra/yassl/libyassl.a ] && ar -x ../../extra/yassl/libyassl.a
3988+rm -f sql_binlog.cc.o rpl_utility.cc.o
3989+%{__cc} $CFLAGS $LDFLAGS -DEMBEDDED_LIBRARY -shared -Wl,-soname,libmysqld.so.%{libmysqld_so_major} \
3990+ -o libmysqld.so.%{libmysqld_so_long} *.o \
3991+ -lpthread -laio -lcrypt -lssl -lcrypto -lz -lrt -lstdc++ -ldl -lm -lc
3992+
3993+# Compile check
3994+cp %{SOURCE6} .
3995+ln -s libmysqld.so.%{libmysqld_so_long} libmysqld.so.%{libmysqld_so_major}
3996+%{__cc} -I../../../%{src_dir}/include -I../../include $CFLAGS \
3997+ mysql-embedded-check.c libmysqld.so.%{libmysqld_so_major}
3998+LD_LIBRARY_PATH=. ldd ./a.out
3999+)
4000+
4001+%install
4002+# Install compat libs
4003+for dir in libmysql libmysql_r ; do
4004+ pushd mysql-%{compatver}/$dir
4005+ make DESTDIR=%{buildroot} install
4006+ popd
4007+done
4008+rm -f %{buildroot}%{_libdir}/mysql/libmysqlclient{,_r}.{a,la,so}
4009+
4010+MBD=$RPM_BUILD_DIR/%{src_dir}
4011+
4012+# Ensure that needed directories exists
4013+install -d -m 0755 %{buildroot}%{_datadir}/mysql/SELinux/RHEL4
4014+install -d -m 0755 %{buildroot}/var/lib/mysql
4015+install -d -m 0755 %{buildroot}/var/run/mysqld
4016+
4017+# Install all binaries
4018+cd $MBD/release
4019+make DESTDIR=%{buildroot} install
4020+
4021+# Install logrotate and autostart
4022+install -D -m 0644 $MBD/release/support-files/mysql-log-rotate %{buildroot}%{_sysconfdir}/logrotate.d/mysql
4023+install -D -m 0644 $MBD/release/packaging/rpm-oel/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
4024+%if 0%{?systemd}
4025+install -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/mysql-systemd-start
4026+install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/mysqld.service
4027+%else
4028+install -D -m 0755 $MBD/release/packaging/rpm-oel/mysql.init %{buildroot}%{_sysconfdir}/init.d/mysqld
4029+%endif
4030+install -D -m 0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/tmpfiles.d/mysql.conf
4031+
4032+install -m 0755 $MBD/release/libmysqld/work/libmysqld.so.%{libmysqld_so_long} \
4033+ %{buildroot}%{_libdir}/mysql/libmysqld.so.%{libmysqld_so_long}
4034+ln -s libmysqld.so.%{libmysqld_so_long} %{buildroot}%{_libdir}/mysql/libmysqld.so.%{libmysqld_so_major}
4035+ln -s libmysqld.so.%{libmysqld_so_long} %{buildroot}%{_libdir}/mysql/libmysqld.so
4036+
4037+
4038+# Make library links
4039+install -d -m 0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d
4040+echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
4041+
4042+# multiarch support
4043+%ifarch %{multiarchs}
4044+mv %{buildroot}/%{_includedir}/mysql/my_config.h \
4045+ %{buildroot}/%{_includedir}/mysql/my_config_%{_arch}.h
4046+install -p -m 0644 %{SOURCE4} %{buildroot}/%{_includedir}/mysql/my_config.h
4047+mv %{buildroot}/%{_bindir}/mysql_config %{buildroot}/%{_bindir}/mysql_config-%{__isa_bits}
4048+install -p -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/mysql_config
4049+%endif
4050+
4051+# Install SELinux files in datadir
4052+install -m 0644 $MBD/%{src_dir}/support-files/RHEL4-SElinux/mysql.{fc,te} \
4053+ %{buildroot}%{_datadir}/mysql/SELinux/RHEL4
4054+
4055+# Remove files pages we explicitly do not want to package
4056+rm -rf %{buildroot}%{_datadir}/mysql/solaris
4057+rm -rf %{buildroot}%{_infodir}/mysql.info*
4058+rm -rf %{buildroot}%{_datadir}/mysql/binary-configure
4059+rm -rf %{buildroot}%{_datadir}/mysql/mysql.server
4060+rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server
4061+rm -f %{buildroot}%{_datadir}/mysql/{ndb-config-2-node,config*}.ini
4062+rm -f %{buildroot}%{_datadir}/mysql/my-*.cnf
4063+%if 0%{?systemd}
4064+rm -rf %{buildroot}%{_sysconfdir}/init.d/mysqld
4065+%endif
4066+rm -rf %{buildroot}%{_bindir}/mysql_embedded
4067+rm -rf %{buildroot}%{_bindir}/mysql_setpermission
4068+rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1*
4069+
4070+%check
4071+%if 0%{?runselftest}
4072+pushd release
4073+make test VERBOSE=1
4074+export MTR_BUILD_THREAD=auto
4075+pushd mysql-test
4076+./mtr \
4077+ --mem --parallel=auto --force --retry=0 \
4078+ --mysqld=--binlog-format=mixed \
4079+ --suite-timeout=720 --testcase-timeout=30
4080+rm -rf var/*
4081+%endif
4082+
4083+%pre server
4084+/usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || :
4085+/usr/sbin/useradd -M -N -g mysql -o -r -d /var/lib/mysql -s /bin/bash \
4086+ -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
4087+
4088+%post server
4089+datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
4090+/bin/chmod 0755 "$datadir"
4091+/bin/touch /var/log/mysqld.log
4092+%if 0%{?systemd}
4093+%systemd_post mysqld.service
4094+/sbin/service mysqld enable >/dev/null 2>&1 || :
4095+%else
4096+/sbin/chkconfig --add mysqld
4097+%endif
4098+
4099+%preun server
4100+%if 0%{?systemd}
4101+%systemd_preun mysqld.service
4102+%else
4103+if [ "$1" = 0 ]; then
4104+ /sbin/service mysqld stop >/dev/null 2>&1 || :
4105+ /sbin/chkconfig --del mysqld
4106+fi
4107+%endif
4108+
4109+%postun server
4110+%if 0%{?systemd}
4111+%systemd_postun_with_restart mysqld.service
4112+%else
4113+if [ $1 -ge 1 ]; then
4114+ /sbin/service mysqld condrestart >/dev/null 2>&1 || :
4115+fi
4116+%endif
4117+
4118+%post libs -p /sbin/ldconfig
4119+
4120+%postun libs -p /sbin/ldconfig
4121+
4122+%post libs-compat -p /sbin/ldconfig
4123+
4124+%postun libs-compat -p /sbin/ldconfig
4125+
4126+%post embedded -p /sbin/ldconfig
4127+
4128+%postun embedded -p /sbin/ldconfig
4129+
4130+%files server
4131+%defattr(-, root, root, -)
4132+%doc %{?license_files_server} %{src_dir}/Docs/ChangeLog
4133+%doc %{src_dir}/Docs/INFO_SRC*
4134+%doc release/Docs/INFO_BIN*
4135+%attr(644, root, root) %{_mandir}/man1/innochecksum.1*
4136+%attr(644, root, root) %{_mandir}/man1/my_print_defaults.1*
4137+%attr(644, root, root) %{_mandir}/man1/myisam_ftdump.1*
4138+%attr(644, root, root) %{_mandir}/man1/myisamchk.1*
4139+%attr(644, root, root) %{_mandir}/man1/myisamlog.1*
4140+%attr(644, root, root) %{_mandir}/man1/myisampack.1*
4141+%attr(644, root, root) %{_mandir}/man1/mysql_convert_table_format.1*
4142+%attr(644, root, root) %{_mandir}/man1/mysql_fix_extensions.1*
4143+%attr(644, root, root) %{_mandir}/man8/mysqld.8*
4144+%attr(644, root, root) %{_mandir}/man1/mysqld_multi.1*
4145+%attr(644, root, root) %{_mandir}/man1/mysqld_safe.1*
4146+%attr(644, root, root) %{_mandir}/man1/mysqldumpslow.1*
4147+%attr(644, root, root) %{_mandir}/man1/mysql_install_db.1*
4148+%attr(644, root, root) %{_mandir}/man1/mysql_plugin.1*
4149+%attr(644, root, root) %{_mandir}/man1/mysql_secure_installation.1*
4150+%attr(644, root, root) %{_mandir}/man1/mysql_upgrade.1*
4151+%attr(644, root, root) %{_mandir}/man1/mysqlhotcopy.1*
4152+%attr(644, root, root) %{_mandir}/man1/mysqlman.1*
4153+%attr(644, root, root) %{_mandir}/man1/mysql.server.1*
4154+%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
4155+%attr(644, root, root) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
4156+%attr(644, root, root) %{_mandir}/man1/mysql_zap.1*
4157+%attr(644, root, root) %{_mandir}/man1/mysqlbug.1*
4158+%attr(644, root, root) %{_mandir}/man1/perror.1*
4159+%attr(644, root, root) %{_mandir}/man1/replace.1*
4160+%attr(644, root, root) %{_mandir}/man1/resolve_stack_dump.1*
4161+%attr(644, root, root) %{_mandir}/man1/resolveip.1*
4162+
4163+%config(noreplace) %{_sysconfdir}/my.cnf
4164+
4165+%attr(755, root, root) %{_bindir}/innochecksum
4166+%attr(755, root, root) %{_bindir}/my_print_defaults
4167+%attr(755, root, root) %{_bindir}/myisam_ftdump
4168+%attr(755, root, root) %{_bindir}/myisamchk
4169+%attr(755, root, root) %{_bindir}/myisamlog
4170+%attr(755, root, root) %{_bindir}/myisampack
4171+%attr(755, root, root) %{_bindir}/mysql_convert_table_format
4172+%attr(755, root, root) %{_bindir}/mysql_fix_extensions
4173+%attr(755, root, root) %{_bindir}/mysql_install_db
4174+%attr(755, root, root) %{_bindir}/mysql_plugin
4175+%attr(755, root, root) %{_bindir}/mysql_secure_installation
4176+%attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql
4177+%attr(755, root, root) %{_bindir}/mysql_upgrade
4178+%attr(755, root, root) %{_bindir}/mysql_zap
4179+%attr(755, root, root) %{_bindir}/mysqlbug
4180+%attr(755, root, root) %{_bindir}/mysqld_multi
4181+%attr(755, root, root) %{_bindir}/mysqld_safe
4182+%attr(755, root, root) %{_bindir}/mysqldumpslow
4183+%attr(755, root, root) %{_bindir}/mysqlhotcopy
4184+%attr(755, root, root) %{_bindir}/mysqltest
4185+%attr(755, root, root) %{_bindir}/perror
4186+%attr(755, root, root) %{_bindir}/replace
4187+%attr(755, root, root) %{_bindir}/resolve_stack_dump
4188+%attr(755, root, root) %{_bindir}/resolveip
4189+%if 0%{?systemd}
4190+%attr(755, root, root) %{_bindir}/mysql-systemd-start
4191+%endif
4192+%attr(755, root, root) %{_sbindir}/mysqld
4193+%attr(755, root, root) %{_sbindir}/mysqld-debug
4194+
4195+%{_libdir}/mysql/plugin
4196+
4197+%attr(644, root, root) %{_datadir}/mysql/fill_help_tables.sql
4198+%attr(644, root, root) %{_datadir}/mysql/mysql_system_tables.sql
4199+%attr(644, root, root) %{_datadir}/mysql/mysql_system_tables_data.sql
4200+%attr(644, root, root) %{_datadir}/mysql/mysql_test_data_timezone.sql
4201+%attr(644, root, root) %{_datadir}/mysql/mysql-log-rotate
4202+%attr(644, root, root) %{_datadir}/mysql/SELinux/RHEL4/mysql.fc
4203+%attr(644, root, root) %{_datadir}/mysql/SELinux/RHEL4/mysql.te
4204+%attr(644, root, root) %{_datadir}/mysql/magic
4205+%attr(644, root, root) %{_prefix}/lib/tmpfiles.d/mysql.conf
4206+%if 0%{?systemd}
4207+%attr(644, root, root) %{_unitdir}/mysql.service
4208+%else
4209+%attr(755, root, root) %{_sysconfdir}/init.d/mysqld
4210+%endif
4211+%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
4212+%dir %attr(755, mysql, mysql) /var/lib/mysql
4213+%dir %attr(755, mysql, mysql) /var/run/mysqld
4214+
4215+%files common
4216+%defattr(-, root, root, -)
4217+%{_datadir}/mysql/charsets/
4218+%{_datadir}/mysql/errmsg-utf8.txt
4219+%{_datadir}/mysql/czech/
4220+%{_datadir}/mysql/danish/
4221+%{_datadir}/mysql/dutch/
4222+%{_datadir}/mysql/english/
4223+%{_datadir}/mysql/estonian/
4224+%{_datadir}/mysql/french/
4225+%{_datadir}/mysql/german/
4226+%{_datadir}/mysql/greek/
4227+%{_datadir}/mysql/hungarian/
4228+%{_datadir}/mysql/italian/
4229+%{_datadir}/mysql/japanese/
4230+%{_datadir}/mysql/korean/
4231+%{_datadir}/mysql/norwegian-ny/
4232+%{_datadir}/mysql/norwegian/
4233+%{_datadir}/mysql/polish/
4234+%{_datadir}/mysql/portuguese/
4235+%{_datadir}/mysql/romanian/
4236+%{_datadir}/mysql/russian/
4237+%{_datadir}/mysql/serbian/
4238+%{_datadir}/mysql/slovak/
4239+%{_datadir}/mysql/spanish/
4240+%{_datadir}/mysql/swedish/
4241+%{_datadir}/mysql/ukrainian/
4242+
4243+%files client
4244+%defattr(-, root, root, -)
4245+%attr(755, root, root) %{_bindir}/msql2mysql
4246+%attr(755, root, root) %{_bindir}/mysql
4247+%attr(755, root, root) %{_bindir}/mysql_find_rows
4248+%attr(755, root, root) %{_bindir}/mysql_waitpid
4249+%attr(755, root, root) %{_bindir}/mysqlaccess
4250+# XXX: This should be moved to %{_sysconfdir}
4251+%attr(644, root, root) %{_bindir}/mysqlaccess.conf
4252+%attr(755, root, root) %{_bindir}/mysqladmin
4253+%attr(755, root, root) %{_bindir}/mysqlbinlog
4254+%attr(755, root, root) %{_bindir}/mysqlcheck
4255+%attr(755, root, root) %{_bindir}/mysqldump
4256+%attr(755, root, root) %{_bindir}/mysqlimport
4257+%attr(755, root, root) %{_bindir}/mysqlshow
4258+%attr(755, root, root) %{_bindir}/mysqlslap
4259+%attr(755, root, root) %{_bindir}/mysql_config
4260+%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits}
4261+
4262+%attr(644, root, root) %{_mandir}/man1/msql2mysql.1*
4263+%attr(644, root, root) %{_mandir}/man1/mysql.1*
4264+%attr(644, root, root) %{_mandir}/man1/mysql_find_rows.1*
4265+%attr(644, root, root) %{_mandir}/man1/mysql_waitpid.1*
4266+%attr(644, root, root) %{_mandir}/man1/mysqlaccess.1*
4267+%attr(644, root, root) %{_mandir}/man1/mysqladmin.1*
4268+%attr(644, root, root) %{_mandir}/man1/mysqlbinlog.1*
4269+%attr(644, root, root) %{_mandir}/man1/mysqlcheck.1*
4270+%attr(644, root, root) %{_mandir}/man1/mysqldump.1*
4271+%attr(644, root, root) %{_mandir}/man1/mysqlimport.1*
4272+%attr(644, root, root) %{_mandir}/man1/mysqlshow.1*
4273+%attr(644, root, root) %{_mandir}/man1/mysqlslap.1*
4274+
4275+%files devel
4276+%defattr(-, root, root, -)
4277+%attr(644, root, root) %{_mandir}/man1/comp_err.1*
4278+%attr(644, root, root) %{_mandir}/man1/mysql_config.1*
4279+%attr(755, root, root) %{_bindir}/mysql_config
4280+%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits}
4281+%{_includedir}/mysql
4282+%{_datadir}/aclocal/mysql.m4
4283+%{_libdir}/mysql/libmysqlclient.a
4284+%{_libdir}/mysql/libmysqlclient_r.a
4285+%{_libdir}/mysql/libmysqlservices.a
4286+%{_libdir}/mysql/libmysqlclient_r.so
4287+%{_libdir}/mysql/libmysqlclient.so
4288+
4289+%files libs
4290+%defattr(-, root, root, -)
4291+%dir %attr(755, root, root) %{_libdir}/mysql
4292+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
4293+%{_libdir}/mysql/libmysqlclient.so.18*
4294+%{_libdir}/mysql/libmysqlclient_r.so.18*
4295+
4296+%files libs-compat
4297+%defattr(-, root, root, -)
4298+%dir %attr(755, root, root) %{_libdir}/mysql
4299+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
4300+%{_libdir}/mysql/libmysqlclient.so.16
4301+%{_libdir}/mysql/libmysqlclient.so.16.0.0
4302+%{_libdir}/mysql/libmysqlclient_r.so.16
4303+%{_libdir}/mysql/libmysqlclient_r.so.16.0.0
4304+
4305+%files test
4306+%defattr(-, root, root, -)
4307+%attr(-, root, root) %{_datadir}/mysql-test
4308+%attr(755, root, root) %{_bindir}/mysql_client_test
4309+%attr(755, root, root) %{_bindir}/mysql_client_test_embedded
4310+%attr(755, root, root) %{_bindir}/mysqltest_embedded
4311+%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1*
4312+%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1*
4313+%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1*
4314+%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1*
4315+%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
4316+
4317+%files embedded
4318+%defattr(-, root, root, -)
4319+%dir %attr(755, root, root) %{_libdir}/mysql
4320+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
4321+%attr(644, root, root) %{_libdir}/mysql/libmysqld.so.*
4322+
4323+%files embedded-devel
4324+%defattr(-, root, root, -)
4325+%attr(644, root, root) %{_libdir}/mysql/libmysqld.a
4326+%attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a
4327+%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
4328+
4329+%changelog
4330+* Fri Oct 25 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.15-1
4331+- Fixed uln advanced rpm libyassl.a error
4332+- Updated to 5.6.15
4333+
4334+* Wed Oct 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.14-3
4335+- Fixed mysql_install_db usage
4336+- Improved handling of plugin directory
4337+
4338+* Fri Sep 27 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.14-2
4339+- Refresh mysql-install patch and service renaming
4340+
4341+* Mon Sep 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.14-1
4342+- Updated to 5.6.14
4343+
4344+* Wed Sep 04 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-5
4345+- Support upgrade from 5.5 ULN packages to 5.6
4346+
4347+* Tue Aug 27 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-4
4348+- Enhanced perl filtering
4349+- Added openssl-devel to buildreq
4350+
4351+* Wed Aug 21 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-3
4352+- Removed mysql_embedded binary to resolve multilib conflict issue
4353+
4354+* Fri Aug 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-2
4355+- Fixed Provides and Obsoletes issues in server, test packages
4356+
4357+* Wed Aug 14 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-1
4358+- Updated to 5.6.13
4359+
4360+* Mon Aug 05 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-9
4361+- Added files list to embedded packages
4362+
4363+* Thu Aug 01 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-8
4364+- Updated libmysqld.a with libmysqld.so in embedded package
4365+
4366+* Mon Jul 29 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-7
4367+- Updated test package dependency from client to server
4368+
4369+* Wed Jul 24 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-6
4370+- Added libs-compat dependency under libs package to resolve server
4371+ installation conflicts issue.
4372+
4373+* Wed Jul 17 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-5
4374+- Removed libmysqlclient.so.16 from libs package
4375+
4376+* Fri Jul 05 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-4
4377+- Adjusted to work on OEL6
4378+
4379+* Wed Jun 26 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-3
4380+- Move libs to mysql/
4381+- Basic multi arch support
4382+- Fix changelog dates
4383+
4384+* Thu Jun 20 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-2
4385+- Major cleanup
4386+
4387+* Tue Jun 04 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-1
4388+- Updated to 5.6.12
4389+
4390+* Mon Nov 05 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
4391+
4392+- Allow to override the default to use the bundled yaSSL by an option like
4393+ --define="with_ssl /path/to/ssl"
4394+
4395+* Wed Oct 10 2012 Bjorn Munch <bjorn.munch@oracle.com>
4396+
4397+- Replace old my-*.cnf config file examples with template my-default.cnf
4398+
4399+* Fri Oct 05 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
4400+
4401+- Let the installation use the new option "--random-passwords" of "mysql_install_db".
4402+ (Bug# 12794345 Ensure root password)
4403+- Fix an inconsistency: "new install" vs "upgrade" are told from the (non)existence
4404+ of "$mysql_datadir/mysql" (holding table "mysql.user" and other system stuff).
4405+
4406+* Tue Jul 24 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
4407+
4408+- Add a macro "runselftest":
4409+ if set to 1 (default), the test suite will be run during the RPM build;
4410+ this can be oveeridden via the command line by adding
4411+ --define "runselftest 0"
4412+ Failures of the test suite will NOT make the RPM build fail!
4413+
4414+* Mon Jul 16 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
4415+
4416+- Add the man page for the "mysql_config_editor".
4417+
4418+* Mon Jun 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
4419+
4420+- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging.
4421+
4422+* Wed Feb 29 2012 Brajmohan Saxena <brajmohan.saxena@oracle.com>
4423+
4424+- Removal all traces of the readline library from mysql (BUG 13738013)
4425+
4426+* Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
4427+
4428+- Fix duplicate mentioning of "mysql_plugin" and its manual page,
4429+ it is better to keep alphabetic order in the files list (merging!).
4430+
4431+* Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
4432+
4433+- Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace
4434+ the RPMs of any configuration (of the current or the preceding release series)
4435+ by the new ones. This is done by not using the implicitly generated capabilities
4436+ (which include the configuration name) and relying on more generic ones which
4437+ just list the function ("server", "client", ...).
4438+ The implicit generation cannot be prevented, so all these capabilities must be
4439+ explicitly listed in "Obsoletes:"
4440+
4441+* Tue Sep 13 2011 Jonathan Perkin <jonathan.perkin@oracle.com>
4442+
4443+- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6. Due to
4444+ changes in RPM behaviour ($RPM_BUILD_ROOT is removed prior to install)
4445+ this necessitated a move of the libmygcc.a installation to the install
4446+ phase, which is probably where it belonged in the first place.
4447+
4448+* Tue Sep 13 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
4449+
4450+- "make_win_bin_dist" and its manual are dropped, cmake does it different.
4451+
4452+* Thu Sep 08 2011 Daniel Fischer <daniel.fischer@oracle.com>
4453+
4454+- Add mysql_plugin man page.
4455+
4456+* Tue Aug 30 2011 Tor Didriksen <tor.didriksen@oracle.com>
4457+
4458+- Set CXX=g++ by default to add a dependency on libgcc/libstdc++.
4459+ Also, remove the use of the -fno-exceptions and -fno-rtti flags.
4460+ TODO: update distro_buildreq/distro_requires
4461+
4462+* Tue Aug 30 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
4463+
4464+- Add the manual page for "mysql_plugin" to the server package.
4465+
4466+* Fri Aug 19 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
4467+
4468+- Null-upmerge the fix of bug#37165: This spec file is not affected.
4469+- Replace "/var/lib/mysql" by the spec file variable "%{mysqldatadir}".
4470+
4471+* Fri Aug 12 2011 Daniel Fischer <daniel.fischer@oracle.com>
4472+
4473+- Source plugin library files list from cmake-generated file.
4474+
4475+* Mon Jul 25 2011 Chuck Bell <chuck.bell@oracle.com>
4476+
4477+- Added the mysql_plugin client - enables or disables plugins.
4478+
4479+* Thu Jul 21 2011 Sunanda Menon <sunanda.menon@oracle.com>
4480+
4481+- Fix bug#12561297: Added the MySQL embedded binary
4482+
4483+* Thu Jul 07 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
4484+
4485+- Fix bug#45415: "rpm upgrade recreates test database"
4486+ Let the creation of the "test" database happen only during a new installation,
4487+ not in an RPM upgrade.
4488+ This affects both the "mkdir" and the call of "mysql_install_db".
4489+
4490+* Wed Feb 09 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
4491+
4492+- Fix bug#56581: If an installation deviates from the default file locations
4493+ ("datadir" and "pid-file"), the mechanism to detect a running server (on upgrade)
4494+ should still work, and use these locations.
4495+ The problem was that the fix for bug#27072 did not check for local settings.
4496+
4497+* Mon Jan 31 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
4498+
4499+- Install the new "manifest" files: "INFO_SRC" and "INFO_BIN".
4500+
4501+* Tue Nov 23 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
4502+
4503+- EXCEPTIONS-CLIENT has been deleted, remove it from here too
4504+- Support MYSQL_BUILD_MAKE_JFLAG environment variable for passing
4505+ a '-j' argument to make.
4506+
4507+* Mon Nov 1 2010 Georgi Kodinov <georgi.godinov@oracle.com>
4508+
4509+- Added test authentication (WL#1054) plugin binaries
4510+
4511+* Wed Oct 6 2010 Georgi Kodinov <georgi.godinov@oracle.com>
4512+
4513+- Added example external authentication (WL#1054) plugin binaries
4514+
4515+* Wed Aug 11 2010 Joerg Bruehe <joerg.bruehe@oracle.com>
4516+
4517+- With a recent spec file cleanup, names have changed: A "-community" part was dropped.
4518+ Reflect that in the "Obsoletes" specifications.
4519+- Add a "triggerpostun" to handle the uninstall of the "-community" server RPM.
4520+- This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade".
4521+
4522+* Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@sun.com>
4523+
4524+- Change the behaviour on installation and upgrade:
4525+ On installation, do not autostart the server.
4526+ *Iff* the server was stopped before the upgrade is started, this is taken as a
4527+ sign the administrator is handling that manually, and so the new server will
4528+ not be started automatically at the end of the upgrade.
4529+ The start/stop scripts will still be installed, so the server will be started
4530+ on the next machine boot.
4531+ This is the 5.5 version of fixing bug#27072 (RPM autostarting the server).
4532+
4533+* Tue Jun 1 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
4534+
4535+- Implement SELinux checks from distribution-specific spec file.
4536+
4537+* Wed May 12 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
4538+
4539+- Large number of changes to build using CMake
4540+- Introduce distribution-specific RPMs
4541+- Drop debuginfo, build all binaries with debug/symbols
4542+- Remove __os_install_post, use native macro
4543+- Remove _unpackaged_files_terminate_build, make it an error to have
4544+ unpackaged files
4545+- Remove cluster RPMs
4546+
4547+* Wed Mar 24 2010 Joerg Bruehe <joerg.bruehe@sun.com>
4548+
4549+- Add "--with-perfschema" to the configure options.
4550+
4551+* Mon Mar 22 2010 Joerg Bruehe <joerg.bruehe@sun.com>
4552+
4553+- User "usr/lib*" to allow for both "usr/lib" and "usr/lib64",
4554+ mask "rmdir" return code 1.
4555+- Remove "ha_example.*" files from the list, they aren't built.
4556+
4557+* Wed Mar 17 2010 Joerg Bruehe <joerg.bruehe@sun.com>
4558+
4559+- Fix a wrong path name in handling the debug plugins.
4560+
4561+* Wed Mar 10 2010 Joerg Bruehe <joerg.bruehe@sun.com>
4562+
4563+- Take the result of the debug plugin build and put it into the optimized tree,
4564+ so that it becomes part of the final installation;
4565+ include the files in the packlist. Part of the fixes for bug#49022.
4566+
4567+* Mon Mar 01 2010 Joerg Bruehe <joerg.bruehe@sun.com>
4568+
4569+- Set "Oracle and/or its affiliates" as the vendor and copyright owner,
4570+ accept upgrading from packages showing MySQL or Sun as vendor.
4571+
4572+* Fri Feb 12 2010 Joerg Bruehe <joerg.bruehe@sun.com>
4573+
4574+- Formatting changes:
4575+ Have a consistent structure of separator lines and of indentation
4576+ (8 leading blanks => tab).
4577+- Introduce the variable "src_dir".
4578+- Give the environment variables "MYSQL_BUILD_CC(CXX)" precedence
4579+ over "CC" ("CXX").
4580+- Drop the old "with_static" argument analysis, this is not supported
4581+ in 5.1 since ages.
4582+- Introduce variables to control the handlers individually, as well
4583+ as other options.
4584+- Use the new "--with-plugin" notation for the table handlers.
4585+- Drop handling "/etc/rc.d/init.d/mysql", the switch to "/etc/init.d/mysql"
4586+ was done back in 2002 already.
4587+- Make "--with-zlib-dir=bundled" the default, add an option to disable it.
4588+- Add missing manual pages to the file list.
4589+- Improve the runtime check for "libgcc.a", protect it against being tried
4590+ with the Intel compiler "icc".
4591+
4592+* Mon Jan 11 2010 Joerg Bruehe <joerg.bruehe@sun.com>
4593+
4594+- Change RPM file naming:
4595+ - Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
4596+ - Release counts from 1, not 0.
4597+
4598+* Wed Dec 23 2009 Joerg Bruehe <joerg.bruehe@sun.com>
4599+
4600+- The "semisync" plugin file name has lost its introductory "lib",
4601+ adapt the file lists for the subpackages.
4602+ This is a part missing from the fix for bug#48351.
4603+- Remove the "fix_privilege_tables" manual, it does not exist in 5.5
4604+ (and likely, the whole script will go, too).
4605+
4606+* Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com>
4607+
4608+- Fix some problems with the directives around "tcmalloc" (experimental),
4609+ remove erroneous traces of the InnoDB plugin (that is 5.1 only).
4610+
4611+* Tue Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
4612+
4613+- Removed mysql_fix_privilege_tables
4614+
4615+* Fri Oct 02 2009 Alexander Nozdrin <alexander.nozdrin@sun.com>
4616+
4617+- "mysqlmanager" got removed from version 5.4, all references deleted.
4618+
4619+* Fri Aug 28 2009 Joerg Bruehe <joerg.bruehe@sun.com>
4620+
4621+- Merge up from 5.1 to 5.4: Remove handling for the InnoDB plugin.
4622+
4623+* Thu Aug 27 2009 Joerg Bruehe <joerg.bruehe@sun.com>
4624+
4625+- This version does not contain the "Instance manager", "mysqlmanager":
4626+ Remove it from the spec file so that packaging succeeds.
4627+
4628+* Mon Aug 24 2009 Jonathan Perkin <jperkin@sun.com>
4629+
4630+- Add conditionals for bundled zlib and innodb plugin
4631+
4632+* Fri Aug 21 2009 Jonathan Perkin <jperkin@sun.com>
4633+
4634+- Install plugin libraries in appropriate packages.
4635+- Disable libdaemon_example and ftexample plugins.
4636+
4637+* Thu Aug 20 2009 Jonathan Perkin <jperkin@sun.com>
4638+
4639+- Update variable used for mysql-test suite location to match source.
4640+
4641+* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
4642+
4643+- Correct yesterday's fix, so that it also works for the last flag,
4644+ and fix a wrong quoting: un-quoted quote marks must not be escaped.
4645+
4646+* Thu Nov 06 2008 Kent Boortz <kent.boortz@sun.com>
4647+
4648+- Removed "mysql_upgrade_shell"
4649+- Removed some copy/paste between debug and normal build
4650+
4651+* Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com>
4652+
4653+- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
4654+ This should cover both gcc and icc flags. Fixes bug#40546.
4655+
4656+* Fri Aug 29 2008 Kent Boortz <kent@mysql.com>
4657+
4658+- Removed the "Federated" storage engine option, and enabled in all
4659+
4660+* Tue Aug 26 2008 Joerg Bruehe <joerg@mysql.com>
4661+
4662+- Get rid of the "warning: Installed (but unpackaged) file(s) found:"
4663+ Some generated files aren't needed in RPMs:
4664+ - the "sql-bench/" subdirectory
4665+ Some files were missing:
4666+ - /usr/share/aclocal/mysql.m4 ("devel" subpackage)
4667+ - Manual "mysqlbug" ("server" subpackage)
4668+ - Program "innochecksum" and its manual ("server" subpackage)
4669+ - Manual "mysql_find_rows" ("client" subpackage)
4670+ - Script "mysql_upgrade_shell" ("client" subpackage)
4671+ - Program "ndb_cpcd" and its manual ("ndb-extra" subpackage)
4672+ - Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage)
4673+
4674+* Mon Mar 31 2008 Kent Boortz <kent@mysql.com>
4675+
4676+- Made the "Federated" storage engine an option
4677+- Made the "Cluster" storage engine and sub packages an option
4678+
4679+* Wed Mar 19 2008 Joerg Bruehe <joerg@mysql.com>
4680+
4681+- Add the man pages for "ndbd" and "ndb_mgmd".
4682+
4683+* Mon Feb 18 2008 Timothy Smith <tim@mysql.com>
4684+
4685+- Require a manual upgrade if the alread-installed mysql-server is
4686+ from another vendor, or is of a different major version.
4687+
4688+* Wed May 02 2007 Joerg Bruehe <joerg@mysql.com>
4689+
4690+- "ndb_size.tmpl" is not needed any more,
4691+ "man1/mysql_install_db.1" lacked the trailing '*'.
4692+
4693+* Sat Apr 07 2007 Kent Boortz <kent@mysql.com>
4694+
4695+- Removed man page for "mysql_create_system_tables"
4696+
4697+* Wed Mar 21 2007 Daniel Fischer <df@mysql.com>
4698+
4699+- Add debug server.
4700+
4701+* Mon Mar 19 2007 Daniel Fischer <df@mysql.com>
4702+
4703+- Remove Max RPMs; the server RPMs contain a mysqld compiled with all
4704+ features that previously only were built into Max.
4705+
4706+* Fri Mar 02 2007 Joerg Bruehe <joerg@mysql.com>
4707+
4708+- Add several man pages for NDB which are now created.
4709+
4710+* Fri Jan 05 2007 Kent Boortz <kent@mysql.com>
4711+
4712+- Put back "libmygcc.a", found no real reason it was removed.
4713+
4714+- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
4715+ correct "libgcc.a" path is returned for the 32/64 bit architecture.
4716+
4717+* Mon Dec 18 2006 Joerg Bruehe <joerg@mysql.com>
4718+
4719+- Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
4720+
4721+* Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com>
4722+
4723+- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql"
4724+ in the server RPM.
4725+- The "mysqlmanager" man page got moved from section 1 to 8.
4726+
4727+* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com>
4728+
4729+- Call "make install" using "benchdir_root=%{_datadir}",
4730+ because that is affecting the regression test suite as well.
4731+
4732+* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
4733+
4734+- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB)
4735+ replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading
4736+ (bug#22081).
4737+
4738+* Mon Nov 13 2006 Joerg Bruehe <joerg@mysql.com>
4739+
4740+- Add "--with-partition" t 2006 Joerg Bruehe <joerg@mysql.com>
4741+
4742+- Use the Perl script to run the tests, because it will automatically check
4743+ whether the server is configured with SSL.
4744+
4745+* Tue Jun 27 2006 Joerg Bruehe <joerg@mysql.com>
4746+
4747+- move "mysqldumpslow" from the client RPM to the server RPM (bug#20216)
4748+
4749+- Revert all previous attempts to call "mysql_upgrade" during RPM upgrade,
4750+ there are some more aspects which need to be solved before this is possible.
4751+ For now, just ensure the binary "mysql_upgrade" is delivered and installysql.com>
4752+
4753+- To run "mysql_upgrade", we need a running server;
4754+ start it in isolation and skip password checks.
4755+
4756+* Sat May 20 2006 Kent Boortz <kent@mysql.com>
4757+
4758+- Always compile for PIC, position independent code.
4759+
4760+* Wed May 10 2006 Kent Boortz <kent@mysql.com>
4761+
4762+- Use character set "all" when compiling with Cluster, to make Cluster
4763+ nodes independent on the character set directory, and the problem
4764+ that two RPM sub packages both wants to install this directory.
4765+
4766+* Mon May 01 2006 Kent Boortz <kent@mysql.com>
4767+
4768+- Use "./libtool --mode=execute" instead of searching for the
4769+ executable in current directory and ".libs".
4770+
4771+* Fri Apr 28 2006 Kent Boortz <kent@mysql.com>
4772+
4773+- Install and run "mysql_upgrade"
4774+
4775+* Wed Apr 12 2006 Jim Winstead <jimw@mysql.com>
4776+
4777+- Remove sql-bench, and MySQL-bench RPM (will be built as an independent
4778+ project from the mysql-bench repository)
4779+
4780+* Tue Apr 11 2006 Jim Winstead <jimw@mysql.com>
4781+
4782+- Remove old mysqltestmanager and related programs
4783+* Sat Apr 01 2006 Kent Boortz <kent@mysql.com>
4784+
4785+- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS
4786+
4787+* Tue Mar 07 2006 Kent Boortz <kent@mysql.com>
4788+
4789+- Changed product name from "Community Edition" to "Community Server"
4790+
4791+* Mon Mar 06 2006 Kent Boortz <kent@mysql.com>
4792+
4793+- Fast mutexes is now disabled by default, but should be
4794+ used in Linux builds.
4795+
4796+* Mon Feb 20 2006 Kent Boortz <kent@mysql.com>
4797+
4798+- Reintroduced a max build
4799+- Limited testing of 'debug' and 'max' servers
4800+- Berkeley DB only in 'max'
4801+
4802+* Mon Feb 13 2006 Joerg Bruehe <joerg@mysql.com>
4803+
4804+- Use "-i" on "make test-force";
4805+ this is essential for later evaluation of this log file.
4806+
4807+* Thu Feb 09 2006 Kent Boortz <kent@mysql.com>
4808+
4809+- Pass '-static' to libtool, link static with our own libraries, dynamic
4810+ with system libraries. Link with the bundled zlib.
4811+
4812+* Wed Feb 08 2006 Kristian Nielsen <knielsen@mysql.com>
4813+
4814+- Modified RPM spec to match new 5.1 debug+max combined community packaging.
4815+
4816+* Sun Dec 18 2005 Kent Boortz <kent@mysql.com>
4817+
4818+- Added "client/mysqlslap"
4819+
4820+* Mon Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com>
4821+
4822+- Added zlib to the list of (static) libraries installed
4823+- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
4824+- Compile MySQL with bundled zlib
4825+- Fixed %packager name to "MySQL Production Engineering Team"
4826+
4827+* Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com>
4828+
4829+- Avoid using the "bundled" zlib on "shared" builds:
4830+ As it is not installed (on the build system), this gives dependency
4831+ problems with "libtool" causing the build to fail.
4832+ (Change was done on Nov 11, but left uncommented.)
4833+
4834+* Tue Nov 22 2005 Joerg Bruehe <joerg@mysql.com>
4835+
4836+- Extend the file existence check for "init.d/mysql" on un-install
4837+ to also guard the call to "insserv"/"chkconfig".
4838+
4839+* Thu Oct 27 2005 Lenz Grimmer <lenz@grimmer.com>
4840+
4841+- added more man pages
4842+
4843+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
4844+
4845+- Made yaSSL support an option (off by default)
4846+
4847+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
4848+
4849+- Enabled yaSSL support
4850+
4851+* Sat Oct 15 2005 Kent Boortz <kent@mysql.com>
4852+
4853+- Give mode arguments the same way in all places
4854+lenz@mysql.com>
4855+
4856+- fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
4857+ $RBR variable did not get expanded, thus leaving old build roots behind)
4858+
4859+* Thu Aug 04 2005 Lenz Grimmer <lenz@mysql.com>
4860+
4861+- Fixed the creation of the mysql user group account in the postinstall
4862+ section (BUG 12348)
4863+- Fixed enabling the Archive storage engine in the Max binary
4864+
4865+* Tue Aug 02 2005 Lenz Grimmer <lenz@mysql.com>
4866+
4867+- Fixed the Requires: tag for the server RPM (BUG 12233)
4868+
4869+* Fri Jul 15 2005 Lenz Grimmer <lenz@mysql.com>
4870+
4871+- create a "mysql" user group and assign the mysql user account to that group
4872+ in the server postinstall section. (BUG 10984)
4873+
4874+* Tue Jun 14 2005 Lenz Grimmer <lenz@mysql.com>
4875+
4876+- Do not build statically on i386 by default, only when adding either "--with
4877+ static" or "--define '_with_static 1'" to the RPM build options. Static
4878+ linking really only makes sense when linking against the specially patched
4879+ glibc 2.2.5.
4880+
4881+* Mon Jun 06 2005 Lenz Grimmer <lenz@mysql.com>
4882+
4883+- added mysql_client_test to the "bench" subpackage (BUG 10676)
4884+- added the libndbclient static and shared libraries (BUG 10676)
4885+
4886+* Wed Jun 01 2005 Lenz Grimmer <lenz@mysql.com>
4887+
4888+- use "mysqldatadir" variable instead of hard-coding the path multiple times
4889+- use the "mysqld_user" variable on all occasions a user name is referenced
4890+- removed (incomplete) Brazilian translations
4891+- removed redundant release tags from the subpackage descriptions
4892+
4893+* Wed May 25 2005 Joerg Bruehe <joerg@mysql.com>
4894+
4895+- Added a "make clean" between separate calls to "BuildMySQL".
4896+
4897+* Thu May 12 2005 Guilhem Bichot <guilhem@mysql.com>
4898+
4899+- Removed the mysql_tableinfo script made obsolete by the information schema
4900+
4901+* Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com>
4902+
4903+- Enabled the "blackhole" storage engine for the Max RPM
4904+
4905+* Wed Apr 13 2005 Lenz Grimmer <lenz@mysql.com>
4906+
4907+- removed the MySQL manual files (html/ps/texi) - they have been removed
4908+ from the MySQL sources and are now available seperately.
4909+
4910+* Mon Apr 4 2005 Petr Chardin <petr@mysql.com>
4911+
4912+- old mysqlmanager, mysq* Mon Feb 7 2005 Tomas Ulin <tomas@mysql.com>
4913+
4914+- enabled the "Ndbcluster" storage engine for the max binary
4915+- added extra make install in ndb subdir after Max build to get ndb binaries
4916+- added packages for ndbcluster storage engine
4917+
4918+* Fri Jan 14 2005 Lenz Grimmer <lenz@mysql.com>
4919+
4920+- replaced obsoleted "BuildPrereq" with "BuildRequires" instead
4921+
4922+* Thu Jan 13 2005 Lenz Grimmer <lenz@mysql.com>
4923+
4924+- enabled the "Federated" storage engine for the max binary
4925+
4926+* Tue Jan 04 2005 Petr Chardin <petr@mysql.com>
4927+
4928+- ISAM and merge storage engines were purged. As well as appropriate
4929+ tools and manpages (isamchk and isamlog)
4930+
4931+* Fri Dec 31 2004 Lenz Grimmer <lenz@mysql.com>
4932+
4933+- enabled the "Archive" storage engine for the max binary
4934+- enabled the "CSV" storage engine for the max binary
4935+- enabled the "Example" storage engine for the max binary
4936+
4937+* Thu Aug 26 2004 Lenz Grimmer <lenz@mysql.com>
4938+
4939+- MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860)
4940+
4941+* Fri Aug 20 2004 Lenz Grimmer <lenz@mysql.com>
4942+
4943+- do not link statically on IA64/AMD64 as these systems do not have
4944+ a patched glibc installed
4945+
4946+* Tue Aug 10 2004 Lenz Grimmer <lenz@mysql.com>
4947+
4948+- Added libmygcc.a to the devel subpackage (required to link applications
4949+ against the the embedded server libmysqld.a) (BUG 4921)
4950+
4951+* Mon Aug 09 2004 Lenz Grimmer <lenz@mysql.com>
4952+
4953+- Added EXCEPTIONS-CLIENT to the "devel" package
4954+
4955+* Thu Jul 29 2004 Lenz Grimmer <lenz@mysql.com>
4956+
4957+- disabled OpenSSL in the Max binaries again (the RPM packages were the
4958+ only exception to this anyway) (BUG 1043)
4959+
4960+* Wed Jun 30 2004 Lenz Grimmer <lenz@mysql.com>
4961+
4962+- fixed server postinstall (mysql_install_db was called with the wrong
4963+ parameter)
4964+
4965+* Thu Jun 24 2004 Lenz Grimmer <lenz@mysql.com>
4966+
4967+- added mysql_tzinfo_to_sql to the server subpackage
4968+- run "make clean" instead of "make distclean"
4969+
4970+* Mon Apr 05 2004 Lenz Grimmer <lenz@mysql.com>
4971+
4972+- added ncurses-devel to the build prerequisites (BUG 3377)
4973+
4974+* Thu Feb 12 2004 Lenz Grimmer <lenz@mysql.com>
4975+
4976+- when using gcc, _always_ use CXX=gcc
4977+- replaced Copyright with License field (Copyright is obsolete)
4978+
4979+* Tue Feb 03 2004 Lenz Grimmer <lenz@mysql.com>
4980+
4981+- added myisam_ftdump to the Server package
4982+
4983+* Tue Jan 13 2004 Lenz Grimmer <lenz@mysql.com>
4984+
4985+- link the mysql client against libreadline instead of libedit (BUG 2289)
4986+
4987+* Mon Dec 22 2003 Lenz Grimmer <lenz@mysql.com>
4988+
4989+- marked /etc/logrotate.d/mysql as a config file (BUG 2156)
4990+
4991+* Sat Dec 13 2003 Lenz Grimmer <lenz@mysql.com>
4992+
4993+- fixed file permissions (BUG 1672)
4994+
4995+* Thu Dec 11 2003 Lenz Grimmer <lenz@mysql.com>
4996+
4997+- made testing for gcc3 a bit more robust
4998+
4999+* Fri Dec 05 2003 Lenz Grimmer <lenz@mysql.com>
5000+
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches