database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Bug#11761576 post-push fix: HAVE_EXPLICIT_TEMPLATE_INSTANTIATION in header file broke Mac build

Browse Source
This commit is contained in:
Tor Didriksen
2011-12-02 15:16:39 +01:00
parent b522a6ce78
commit bce2360f53
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sys_vars.cc
View File

@@ -3253,3 +3253,17 @@ static Sys_var_tz Sys_time_zone(
SESSION_VAR(time_zone), NO_CMD_LINE,
DEFAULT(&default_tz), NO_MUTEX_GUARD, IN_BINLOG);
/****************************************************************************
Used templates
****************************************************************************/
#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
template class List<set_var_base>;
template class List_iterator_fast<set_var_base>;
template class Sys_var_unsigned<uint, GET_UINT, SHOW_INT>;
template class Sys_var_unsigned<ulong, GET_ULONG, SHOW_LONG>;
template class Sys_var_unsigned<ha_rows, GET_HA_ROWS, SHOW_HA_ROWS>;
template class Sys_var_unsigned<ulonglong, GET_ULL, SHOW_LONGLONG>;
#endif

14
sql/sys_vars.h
View File

@@ -1606,17 +1606,3 @@ public:
{}
virtual bool session_update(THD *thd, set_var *var);
};
/****************************************************************************
Used templates
****************************************************************************/
#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
template class List<set_var_base>;
template class List_iterator_fast<set_var_base>;
template class Sys_var_unsigned<uint, GET_UINT, SHOW_INT>;
template class Sys_var_unsigned<ulong, GET_ULONG, SHOW_LONG>;
template class Sys_var_unsigned<ha_rows, GET_HA_ROWS, SHOW_HA_ROWS>;
template class Sys_var_unsigned<ulonglong, GET_ULL, SHOW_LONGLONG>;
#endif