diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-05-03 00:10:52 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-05-03 00:10:52 +0200 |
| commit | f2b41e688669a93866d82ec51b769124b31459b2 (patch) | |
| tree | 1b71efbc0ed12c410bb1d196c5de1c831d5dd8bf /sql/mysqld.cc | |
| parent | 463c82e24bb8dc9df7cee357246fdc0d09e3e3af (diff) | |
| parent | d00d1dd1fabf0c4418697d5d978f87e16764556b (diff) | |
| download | mariadb-git-f2b41e688669a93866d82ec51b769124b31459b2.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 64e55e0fe3d..e27dbca77bb 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6965,5 +6965,4 @@ template class I_List_iterator<THD>; template class I_List<i_string>; template class I_List<i_string_pair>; template class I_List<NAMED_LIST>; -FIX_GCC_LINKING_PROBLEM #endif |