Commit 72d2e89b authored by unknown's avatar unknown
Browse files

Sned original NDB error as warning to client 


sql/ha_ndbcluster.cc:
  Send original NDB error as warning to client so it can be retrieved with SHOW WARNINGS or SHOW ERRORS.
parent 77a56a6a

sql/ha_ndbcluster.cc

+7 −2
Original line number Diff line number Diff line
@@ -134,9 +134,14 @@ static int ndb_to_mysql_error(const NdbError *err) 
  uint i;

  for (i=0 ; err_map[i].ndb_err != err->code ; i++)

  {

    if (err_map[i].my_err == -1)

    if (err_map[i].my_err == -1){

      // Push the NDB error message as warning

      push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,

			  ER_GET_ERRMSG, ER(ER_GET_ERRMSG),

			  err->code, err->message, "NDB");      

      return err->code;

    }

  }

  return err_map[i].my_err;

}
@@ -2188,7 +2193,7 @@ int ha_ndbcluster::index_read(byte *buf, 
  default:

  case UNDEFINED_INDEX:

    DBUG_ASSERT(false);

    return 1;

    DBUG_RETURN(1);

    break;

  }