Commit e3b8da50 authored by bell@sanja.is.com.ua's avatar bell@sanja.is.com.ua

Merge abelkin@work.mysql.com:/home/bk/mysql-4.0

into sanja.is.com.ua:/home/bell/mysql/mysql-4.0
parents f0e137e5 cc08da4f
...@@ -19,7 +19,7 @@ BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h ...@@ -19,7 +19,7 @@ BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h
pkginclude_HEADERS = dbug.h m_string.h my_sys.h my_list.h \ pkginclude_HEADERS = dbug.h m_string.h my_sys.h my_list.h \
mysql.h mysql_com.h mysqld_error.h mysql_embed.h \ mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
my_pthread.h my_no_pthread.h raid.h errmsg.h \ my_pthread.h my_no_pthread.h raid.h errmsg.h \
my_global.h my_net.h \ my_global.h my_net.h my_alloc.h\
sslopt-case.h sslopt-longopts.h sslopt-usage.h \ sslopt-case.h sslopt-longopts.h sslopt-usage.h \
sslopt-vars.h $(BUILT_SOURCES) sslopt-vars.h $(BUILT_SOURCES)
noinst_HEADERS = config-win.h \ noinst_HEADERS = config-win.h \
......
...@@ -464,7 +464,7 @@ typedef struct st_changeable_var { ...@@ -464,7 +464,7 @@ typedef struct st_changeable_var {
} CHANGEABLE_VAR; } CHANGEABLE_VAR;
#include "my_alloc.h" #include <my_alloc.h>
/* Prototypes for mysys and my_func functions */ /* Prototypes for mysys and my_func functions */
......
...@@ -100,7 +100,7 @@ typedef struct st_mysql_rows { ...@@ -100,7 +100,7 @@ typedef struct st_mysql_rows {
typedef MYSQL_ROWS *MYSQL_ROW_OFFSET; /* offset to current row */ typedef MYSQL_ROWS *MYSQL_ROW_OFFSET; /* offset to current row */
#include "my_alloc.h" #include <my_alloc.h>
typedef struct st_mysql_data { typedef struct st_mysql_data {
my_ulonglong rows; my_ulonglong rows;
......
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