Commit d406a647 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/bug10241 

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


include/my_global.h:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.h:
  Auto merged
BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927:
  Auto merged
BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc:
  Auto merged
sql/examples/ha_archive.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/procedure.h:
  Auto merged
sql/protocol.h:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
sql/tztime.h:
  Auto merged
parents 848611b5 9ab5f614

include/my_global.h

+5 −0
Original line number Diff line number Diff line
@@ -43,6 +43,11 @@ 
#define HAVE_ERRNO_AS_DEFINE

#endif /* __CYGWIN__ */



/* Determine when to use "#pragma interface" */

#if !defined(__CYGWIN__) && !defined(__ICC) && (__GNUC__ < 3)

#define USE_PRAGMA_INTERFACE

#endif



#if defined(i386) && !defined(__i386__)

#define __i386__

#endif

include/raid.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ extern "C" { 
#ifdef __cplusplus

}



#ifdef __GNUC__

#ifdef USE_PRAGMA_INTERFACE

#pragma interface			/* gcc class implementation */

#endif

sql/examples/ha_archive.h

+1 −1
Original line number Diff line number Diff line
@@ -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__

#ifdef USE_PRAGMA_INTERFACE

#pragma interface			/* gcc class implementation */

#endif

sql/examples/ha_example.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
  that you can implement.

*/



#ifdef __GNUC__

#ifdef USE_PRAGMA_INTERFACE

#pragma interface			/* gcc class implementation */

#endif

sql/field.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
  variables must declare the size_of() member function.

*/



#ifdef __GNUC__

#ifdef USE_PRAGMA_INTERFACE

#pragma interface			/* gcc class implementation */

#endif