diff options
| author | unknown <tulin@dl145b.mysql.com> | 2005-06-20 12:42:39 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145b.mysql.com> | 2005-06-20 12:42:39 +0200 |
| commit | 20c63a30ec88d9cc9428c98a6fbfa4dc238adf53 (patch) | |
| tree | 66b094cec83ebbfcac3bfda55ccb78096d13e4fa /sql/sql_acl.cc | |
| parent | 82a69ff10815b96e6c23c2946c707fd8ebb3cbb8 (diff) | |
| parent | 1c756c04c23e98f4e3d5e6ba5bac74c6354ad009 (diff) | |
| download | mariadb-git-20c63a30ec88d9cc9428c98a6fbfa4dc238adf53.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
configure.in:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 32c769537a1..13f6191a99f 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -5325,7 +5325,7 @@ bool sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name, Instantiate used templates *****************************************************************************/ -#ifdef __GNUC__ +#ifdef EXPLICIT_TEMPLATE_INSTANTIATION template class List_iterator<LEX_COLUMN>; template class List_iterator<LEX_USER>; template class List<LEX_COLUMN>; |