after merge fix
sql/sql_parse.cc
    correct max_connections condition


sql/ha_ndbcluster.cc:
  after merge fix
sql/sql_parse.cc:
  correct max_connections condition