Commit 31d5fbcc authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1 

into  mysql.com:/usr/local/mysql/tmp-5.1
parents 0781fc0c 52914641

include/mysql/plugin.h

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ 
#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

sql/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc 
               time.cc tztime.cc uniques.cc unireg.cc item_xmlfunc.cc 

               rpl_tblmap.cc sql_binlog.cc event_scheduler.cc event_timed.cc 

               sql_tablespace.cc event.cc ../sql-common/my_user.c 

               partition_info.cc

               partition_info.cc rpl_injector.cc

               ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc

  			   ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h

			   ${PROJECT_SOURCE_DIR}/include/mysqld_error.h