storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Fix sol10-amd64-a compile failure, conflict with system headers.
sql/log.cc:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/mysql_priv.h:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/sql_delete.cc:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/table.cc:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/sql_parse.cc:
  Fix HPUX compile failure, initializing char * with const char *