Commit 996986fe authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6449
parents 0f9f2b02 9ae173c4

sql/ha_ndbcluster.cc

+8 −1
Original line number Diff line number Diff line
@@ -148,6 +148,13 @@ static int ndb_to_mysql_error(const NdbError *err) 
      return err->code;

    }

  }

  // Push the NDB error message as warning

  // this since e.g. HA_ERR_RECORD_FILE_FULL maps to

  // several error codes in NDB, and the uses needs

  // to know which one it is

  push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,

		      ER_GET_ERRMSG, ER(ER_GET_ERRMSG),

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

  return err_map[i].my_err;

}