diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-05-26 12:10:05 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-05-26 12:10:05 +0200 |
| commit | 7d7b5dbcae39bd0d3c035ab02be6100e9bc226cd (patch) | |
| tree | 066d77fb4f7d7a5c0ac156d5fa637310fed71757 /sql/ha_myisammrg.cc | |
| parent | aa3a934b9d2e7585d9e40a4f56a060bad718baf5 (diff) | |
| parent | 22944a956350d6276f9a852f78dee2b8126e68c7 (diff) | |
| download | mariadb-git-7d7b5dbcae39bd0d3c035ab02be6100e9bc226cd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
include/my_global.h:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'sql/ha_myisammrg.cc')
| -rw-r--r-- | sql/ha_myisammrg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 0b160d72aab..edb3521470f 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -15,7 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef __GNUC__ +#ifdef USE_PRAGMA_IMPLEMENTATION #pragma implementation // gcc: Class implementation #endif |