• Konstantin Osipov's avatar
    Backport of: · e9129424
    Konstantin Osipov authored
    ------------------------------------------------------------
    revno: 2630.4.37
    committer: Dmitry Lenev <dlenev@mysql.com>
    branch nick: mysql-6.0-3726-w2
    timestamp: Wed 2008-06-25 20:28:57 +0400
    message:
      Fix build failure of mysql-6.0-3726 tree on Windows.
    
      The failure was caused by the fact that sql/mdl.cc was
      using __func__ macro without including sql_profile.h
      header which contained definition of this macro for
      those platforms that miss it.
    
      This patch solves this problem by moving this define to
      include/my_global.h which makes it available in modules
      which don't/can't include sql/mysql_priv.h.
    
    This is a patch that is part of WL#3726.
    
    include/my_global.h:
      Moved definition of __func__ macro from sql/sql_profile.h to
      include/my_global.h to make it accessible from those modules
      of the server which don't include mysql_priv.h.
    sql/sql_profile.cc:
      Removed _unknown_func_ const variable since it is no longer used
      by __func__ macro.
    sql/sql_profile.h:
      Moved definition of __func__ macro from sql/sql_profile.h to
      include/my_global.h to make it accessible from those modules
      of the server which don't include mysql_priv.h.
    e9129424
sql_profile.cc 21.7 KB