Conflicts:
	VERSION
	mysql-test/suite/ndb/r/ndb_join_pushdown_bka.result
	mysql-test/suite/ndb/r/ndb_join_pushdown_default.result
	mysql-test/suite/ndb/r/ndb_join_pushdown_nobnl.result
	mysql-test/suite/ndb/r/ndb_subquery.result
	sql/ndb_conflict.cc
	sql/ndb_conflict.h
	storage/ndb/CMakeLists.txt
	storage/ndb/VERSION
	storage/ndb/src/common/portlib/NdbThread.c
	storage/ndb/src/ndbapi/trp_buffer.cpp
	storage/ndb/test/run-test/daily-basic--02-tests.txt
	storage/ndb/tools/listTables.cpp
	storage/ndb/tools/restore/restore_main.cpp