Commit 8a242d96 authored by serg@serg.mylan's avatar serg@serg.mylan

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl
parents 9db19fdf 7e8b145b
......@@ -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\
......
......@@ -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
......
......@@ -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 */
......
......@@ -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;
......
......@@ -51,7 +51,7 @@ TODO:
#include "ha_tina.h"
#include <sys/mman.h>
#include <plugin.h>
#include <mysql/plugin.h>
/* Stuff for shares */
pthread_mutex_t tina_mutex;
......
......@@ -70,7 +70,7 @@
#include "mysql_priv.h"
#include "ha_example.h"
#include <plugin.h>
#include <mysql/plugin.h>
static handler* example_create_handler(TABLE_SHARE *table);
static int example_init_func();
......
......@@ -22,7 +22,7 @@
#include <m_ctype.h>
#include <my_tree.h>
#include <queues.h>
#include <plugin.h>
#include <mysql/plugin.h>
#define true_word_char(s,X) (my_isalnum(s,X) || (X)=='_')
#define misc_word_char(X) 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment