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
This commit is contained in:
unknown 2005-06-22 14:11:23 +05:00
commit 7e12a287ce
27 changed files with 67 additions and 49 deletions

View file

@ -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