Commit 567561ed authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
parents 4bc57533 a822d651

include/errmsg.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



/* Error messages for MySQL clients */

/* (Error messages for the daemon are in share/language/errmsg.sys) */

/* (Error messages for the daemon are in sql/share/errmsg.txt) */



#ifdef	__cplusplus

extern "C" {

include/mysql/plugin.h

+1 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
  Plugin API. Common for all plugin types.

*/



#define MYSQL_PLUGIN_INTERFACE_VERSION 0x0001

#define MYSQL_PLUGIN_INTERFACE_VERSION 0x0002



/*

  The allowable types of plugins
@@ -31,10 +31,6 @@ 
#define MYSQL_FTPARSER_PLUGIN        2  /* Full-text parser plugin      */

#define MYSQL_MAX_PLUGIN_TYPE_NUM    3  /* The number of plugin types   */



#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__)  || __GNUC__ == 2 && __GNUC_MINOR__ < 8)

#define __attribute__(A)

#endif



/*

  Macros for beginning and ending plugin declarations.  Between

  mysql_declare_plugin and mysql_declare_plugin_end there should

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ 
noinst_HEADERS =	embedded_priv.h emb_qcache.h



sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \

	ha_innodb.cc ha_ndbcluster.cc \

	     ha_ndbcluster.cc \

	ha_ndbcluster_binlog.cc ha_partition.cc \

	handler.cc sql_handler.cc \

	hostname.cc init.cc password.c \

plugin/fulltext/plugin_example.c

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 
#include <ctype.h>

#include <mysql/plugin.h>



#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__)  || __GNUC__ == 2 && __GNUC_MINOR__ < 8)

#define __attribute__(A)

#endif



static long number_of_calls= 0; /* for SHOW STATUS, see below */



/*

sql/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER 
ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc

               discover.cc ../libmysql/errmsg.c field.cc field_conv.cc 

               filesort.cc gstream.cc

               ha_innodb.cc ha_partition.cc

               ha_partition.cc

               handler.cc hash_filo.cc hash_filo.h 

               hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc 

               item_create.cc item_func.cc item_geofunc.cc item_row.cc