Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/space/my/mysql-4.1


sql/ha_myisammrg.cc:
  Auto merged
This commit is contained in:
unknown 2005-05-27 09:52:03 +02:00
commit cc78467d3a
52 changed files with 105 additions and 65 deletions

View file

@ -48,6 +48,11 @@
#define USE_PRAGMA_INTERFACE
#endif
/* Determine when to use "#pragma implementation" */
#if !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)
#define USE_PRAGMA_IMPLEMENTATION
#endif
#if defined(i386) && !defined(__i386__)
#define __i386__
#endif