- fix conflicts in copyright headers
 - replace  Sql_condition::WARN_LEVEL_WARN with
   Sql_condition::SL_WARNING
 - replace usage of pthread_ with native_
 - Add SHOW_SCOPE_GLOBAL to new(or refactored) status variables

Conflicts:
	.gitignore
	VERSION
	mysql-test/collections/default.experimental
	mysql-test/suite/ndb/r/ndb_alter_table_online.result
	mysql-test/suite/ndb/r/ndb_alter_table_online2.result
	mysql-test/suite/ndb/r/ndb_types.result
	mysql-test/suite/ndb/t/ndb_types.test
	mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result
	mysql-test/suite/ndb_binlog/r/ndb_binlog_discover_multi.result
	mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result
	mysql-test/suite/ndb_binlog/t/ndb_binlog_discover.test
	mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result
	mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_ext.result
	mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans.result
	mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans_ext.result
	mysql-test/suite/ndb_rpl/t/ndb_conflict_info.inc
	mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch.inc
	mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.inc
	mysql-test/suite/ndb_rpl/t/ndb_trans_conflict_info.inc
	mysql-test/suite/ndb_rpl/t/ndb_trans_conflict_info_stable.inc
	mysql-test/suite/rpl/r/rpl_4threads_deadlock.result
	mysql-test/suite/rpl/t/rpl_4threads_deadlock.test
	packaging/rpm-oel/mysql.spec.in
	scripts/mysql_system_tables.sql
	sql/ha_ndb_ddl_fk.cc
	sql/ha_ndbcluster.cc
	sql/ha_ndbcluster_binlog.cc
	sql/ha_ndbcluster_binlog.h
	sql/sql_show.h
	storage/ndb/CMakeLists.txt
	storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionFactoryImpl.java
	storage/ndb/include/kernel/GlobalSignalNumbers.h
	storage/ndb/include/kernel/ndb_limits.h
	storage/ndb/include/mgmapi/mgmapi_config_parameters.h
	storage/ndb/include/ndbapi/NdbDictionary.hpp
	storage/ndb/include/transporter/TransporterCallback.hpp
	storage/ndb/include/transporter/TransporterRegistry.hpp
	storage/ndb/src/common/debugger/signaldata/CMakeLists.txt
	storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
	storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
	storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
	storage/ndb/src/common/portlib/NdbCondition.c
	storage/ndb/src/common/transporter/TransporterRegistry.cpp
	storage/ndb/src/kernel/blocks/ERROR_codes.txt
	storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
	storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
	storage/ndb/src/kernel/blocks/lgman.cpp
	storage/ndb/src/kernel/blocks/tsman.cpp
	storage/ndb/src/kernel/error/ErrorReporter.cpp
	storage/ndb/src/kernel/vm/DLHashTable.hpp
	storage/ndb/src/kernel/vm/mt.cpp
	storage/ndb/src/mgmsrv/MgmtSrvr.hpp
	storage/ndb/src/mgmsrv/Services.cpp
	storage/ndb/src/ndbapi/ClusterMgr.cpp
	storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
	storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
	storage/ndb/src/ndbapi/NdbScanOperation.cpp
	storage/ndb/src/ndbapi/TransporterFacade.hpp
	storage/ndb/src/ndbapi/WakeupHandler.cpp
	storage/ndb/src/ndbapi/trp_buffer.hpp
	storage/ndb/src/ndbapi/trp_client.hpp
	storage/ndb/test/ndbapi/testBasic.cpp
	storage/ndb/test/ndbapi/testIndex.cpp
	storage/ndb/test/ndbapi/testLimits.cpp
	storage/ndb/test/ndbapi/testNdbApi.cpp
	storage/ndb/test/src/HugoTransactions.cpp
	storage/ndb/tools/ndb_dist_priv.sql
	support-files/mysql.spec.sh