diff options
| author | unknown <ramil@mysql.com> | 2005-10-24 11:36:29 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-10-24 11:36:29 +0500 |
| commit | 39af58dbd46636bf4d5bcdda56a090905f740ad7 (patch) | |
| tree | 619517758503f7aaf39c2b8b7a147627ef05ce4a /server-tools/instance-manager/command.cc | |
| parent | 811c6d216ec224a019dad5a99e356720677b6d22 (diff) | |
| parent | d29ecd5e91adf6eaeb4f2afef0db30648fe08065 (diff) | |
| download | mariadb-git-39af58dbd46636bf4d5bcdda56a090905f740ad7.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10303
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'server-tools/instance-manager/command.cc')
| -rw-r--r-- | server-tools/instance-manager/command.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/command.cc b/server-tools/instance-manager/command.cc index 73dd49ef8b8..f76366d5661 100644 --- a/server-tools/instance-manager/command.cc +++ b/server-tools/instance-manager/command.cc @@ -14,7 +14,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef __GNUC__ +#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION) #pragma implementation #endif |