From bce2360f53eb238aba4196c4893bc0ecf560a6cd Mon Sep 17 00:00:00 2001
From: Tor Didriksen <tor.didriksen@oracle.com>
Date: Fri, 2 Dec 2011 15:16:39 +0100
Subject: [PATCH] Bug#11761576 post-push fix:
 HAVE_EXPLICIT_TEMPLATE_INSTANTIATION in header file broke Mac build

---
 sql/sys_vars.cc | 14 ++++++++++++++
 sql/sys_vars.h  | 14 --------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 65cc4d4c4ab..f5a9ab3b55c 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -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
+
diff --git a/sql/sys_vars.h b/sql/sys_vars.h
index 98ff5f9fa02..bde48209251 100644
--- a/sql/sys_vars.h
+++ b/sql/sys_vars.h
@@ -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
-