Commit fa7b4108 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl
parents 12697a2c 9236e3c2

include/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ 
			errmsg.h my_global.h my_net.h my_alloc.h \

			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \

			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \

			mysql_time.h plugin.h $(BUILT_SOURCES)

			mysql_time.h mysql/plugin.h $(BUILT_SOURCES)

noinst_HEADERS =	config-win.h config-os2.h config-netware.h \

			heap.h my_bitmap.h my_uctype.h \

			myisam.h myisampack.h myisammrg.h ft_global.h\

include/myisam.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ extern "C" { 
#include "keycache.h"

#endif

#include "my_handler.h"

#include <plugin.h>

#include <mysql/plugin.h>



/*

  There is a hard limit for the maximum number of keys as there are only

include/plugin.h→include/mysql/plugin.h

+0 −0

File moved.

View file

plugin/fulltext/plugin_example.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#include <stdlib.h>

#include <ctype.h>

#include <plugin.h>

#include <mysql/plugin.h>



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

sql/sql_plugin.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#define SHOW_FUNC    SHOW_FUNC, SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_LONGLONG, \

                     SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, SHOW_HAVE,   \

                     SHOW_HA_ROWS, SHOW_SYS, SHOW_LONG_NOFLUSH

#include <plugin.h>

#include <mysql/plugin.h>

#undef SHOW_FUNC

typedef enum enum_mysql_show_type SHOW_TYPE;

typedef struct st_mysql_show_var SHOW_VAR;