diff options
| author | unknown <svoj@mysql.com> | 2005-06-22 14:11:23 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com> | 2005-06-22 14:11:23 +0500 |
| commit | 7e12a287ce8d3417631e83b9eb738e9c42cc01ec (patch) | |
| tree | 4a72231770aa4822e2ef8370cab712b8ef6173e9 /sql/item_buff.cc | |
| parent | cceab6e62c3496b7ae58e515e3ffc0f76be050de (diff) | |
| parent | 80a621321becb37e0505128f58033796c7f38605 (diff) | |
| download | mariadb-git-7e12a287ce8d3417631e83b9eb738e9c42cc01ec.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.cc:
Auto merged
sql/item_buff.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item_buff.cc')
| -rw-r--r-- | sql/item_buff.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_buff.cc b/sql/item_buff.cc index 6652aaafb57..a67e420170a 100644 --- a/sql/item_buff.cc +++ b/sql/item_buff.cc @@ -146,7 +146,7 @@ bool Cached_item_decimal::cmp() ** Instansiate templates *****************************************************************************/ -#ifdef EXPLICIT_TEMPLATE_INSTANTIATION +#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION template class List<Cached_item>; template class List_iterator<Cached_item>; #endif |