Conflicts:
	mysql-test/suite/ndb/r/ndb_condition_pushdown.result
	mysql-test/suite/ndb/r/ndb_gis.result
	mysql-test/suite/ndb/t/ndb_condition_pushdown.test
	scripts/mysql_system_tables_fix.sql
	sql/sql_parse.cc
	sql/sql_table.cc