mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1-nl
This commit is contained in:
unknown 2006-02-14 15:09:28 +01:00
commit fa7b4108de
8 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/Makefile.am
View file

@ -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 \ errmsg.h my_global.h my_net.h my_alloc.h \
my_getopt.h sslopt-longopts.h my_dir.h typelib.h \ my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.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 \ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
heap.h my_bitmap.h my_uctype.h \ heap.h my_bitmap.h my_uctype.h \
myisam.h myisampack.h myisammrg.h ft_global.h\ myisam.h myisampack.h myisammrg.h ft_global.h\

2
include/myisam.h
View file

@ -32,7 +32,7 @@ extern "C" {
#include "keycache.h" #include "keycache.h"
#endif #endif
#include "my_handler.h" #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 There is a hard limit for the maximum number of keys as there are only

0
include/plugin.h → include/mysql/plugin.h
View file

2
plugin/fulltext/plugin_example.c
View file

@ -15,7 +15,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#include <plugin.h> #include <mysql/plugin.h>
long number_of_calls= 0; /* for SHOW STATUS, see below */ long number_of_calls= 0; /* for SHOW STATUS, see below */

2
sql/sql_plugin.h
View file

@ -24,7 +24,7 @@
#define SHOW_FUNC SHOW_FUNC, SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_LONGLONG, \ #define SHOW_FUNC SHOW_FUNC, SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_LONGLONG, \
SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, SHOW_HAVE, \ SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, SHOW_HAVE, \
SHOW_HA_ROWS, SHOW_SYS, SHOW_LONG_NOFLUSH SHOW_HA_ROWS, SHOW_SYS, SHOW_LONG_NOFLUSH
#include <plugin.h> #include <mysql/plugin.h>
#undef SHOW_FUNC #undef SHOW_FUNC
typedef enum enum_mysql_show_type SHOW_TYPE; typedef enum enum_mysql_show_type SHOW_TYPE;
typedef struct st_mysql_show_var SHOW_VAR; typedef struct st_mysql_show_var SHOW_VAR;

2
storage/csv/ha_tina.cc
View file

@ -51,7 +51,7 @@ TODO:
#include "ha_tina.h" #include "ha_tina.h"
#include <sys/mman.h> #include <sys/mman.h>
#include <plugin.h> #include <mysql/plugin.h>
/* Stuff for shares */ /* Stuff for shares */
pthread_mutex_t tina_mutex; pthread_mutex_t tina_mutex;

2
storage/example/ha_example.cc
View file

@ -70,7 +70,7 @@
#include "mysql_priv.h" #include "mysql_priv.h"
#include "ha_example.h" #include "ha_example.h"
#include <plugin.h> #include <mysql/plugin.h>
static handler* example_create_handler(TABLE_SHARE *table); static handler* example_create_handler(TABLE_SHARE *table);
static int example_init_func(); static int example_init_func();

2
storage/myisam/ftdefs.h
View file

@ -22,7 +22,7 @@
#include <m_ctype.h> #include <m_ctype.h>
#include <my_tree.h> #include <my_tree.h>
#include <queues.h> #include <queues.h>
#include <plugin.h> #include <mysql/plugin.h>
#define true_word_char(s,X) (my_isalnum(s,X) || (X)=='_') #define true_word_char(s,X) (my_isalnum(s,X) || (X)=='_')
#define misc_word_char(X) 0 #define misc_word_char(X) 0