disabled.def:

  Disabled failing tests
mysql_priv.h:
  Removed compiler warning

mysql-test/t/disabled.def

@@ -26,3 +26,6 @@ rpl_ndb_basic   : Bug#16228
 rpl_sp          : Bug #16456
 ndb_autodiscover : Needs to be fixed w.r.t binlog
 ndb_autodiscover2 : Needs to be fixed w.r.t binlog
+ndb_alter_table_row : dbug assert in RBR mode when executing test suite
+ndb_condition_pushdown: Bug #16596: Crash in mysql_unpack_partition
+ndb_index_ordered : Bug #16596: Crash in mysql_unpack_partition

sql/mysql_priv.h

@@ -897,7 +897,7 @@ void free_status_vars();
 
 /* information schema */
 extern LEX_STRING information_schema_name;
-const extern LEX_STRING partition_keywords[];
+extern const LEX_STRING partition_keywords[];
 LEX_STRING *make_lex_string(THD *thd, LEX_STRING *lex_str,
                             const char* str, uint length,
                             bool allocate_lex_string);