diff options
| author | unknown <svoj@mysql.com> | 2005-06-20 11:33:57 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com> | 2005-06-20 11:33:57 +0500 |
| commit | 2ccb51061b31d1537bd3f7d32ea0ed2132fdc7f4 (patch) | |
| tree | df61140b232db6d3484d20b035890b7a71ad9eaf /sql/table.cc | |
| parent | e9a87395954499b775896b56f020f50e714d371d (diff) | |
| parent | 2c8ee686d8e626c4ccc54fd0534d5b4740d114ba (diff) | |
| download | mariadb-git-2ccb51061b31d1537bd3f7d32ea0ed2132fdc7f4.tar.gz | |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
sql/item_buff.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index f7dc0446a77..23238cdd792 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2236,7 +2236,7 @@ const char *Field_iterator_view::name() ** Instansiate templates *****************************************************************************/ -#ifdef __GNUC__ +#ifdef EXPLICIT_TEMPLATE_INSTANTIATION template class List<String>; template class List_iterator<String>; #endif |