Commit e71ef941 authored Jun 02, 2005 by unknown

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

into mysql.com:/Users/kent/mysql/bk/mysql-4.1


sql/item_func.cc:
  Auto merged

parents 638bb0a2 cee10f97

client/sql_string.cc

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,11 +16,12 @@

		/* This file is originally from the mysql distribution. Coded by monty */

		#include <my_global.h>

		#ifdef USE_PRAGMA_IMPLEMENTATION
		#pragma implementation // gcc: Class implementation
		#endif

		#include <my_global.h>
		#include <my_sys.h>
		#include <m_string.h>
		#include <m_ctype.h>

mysys/raid.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,8 @@
		tonu@mysql.com & monty@mysql.com
		*/

		#include <my_global.h>

		#ifdef USE_PRAGMA_IMPLEMENTATION
		#pragma implementation // gcc: Class implementation
		#endif

sql/examples/ha_archive.cc

+3 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,9 @@
		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__
		#include <my_global.h>

		#ifdef USE_PRAGMA_IMPLEMENTATION
		#pragma implementation // gcc: Class implementation
		#endif

sql/examples/ha_example.cc

+3 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,9 @@
		-Brian
		*/

		#ifdef __GNUC__
		#include <my_global.h>

		#ifdef USE_PRAGMA_IMPLEMENTATION
		#pragma implementation // gcc: Class implementation
		#endif

sql/examples/ha_tina.cc

+3 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,9 @@
		-Brian
		*/

		#ifdef __GNUC__
		#include <my_global.h>

		#ifdef USE_PRAGMA_IMPLEMENTATION
		#pragma implementation // gcc: Class implementation
		#endif