diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-05-10 15:06:35 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-05-10 15:06:35 -0600 |
| commit | 20cda0b8afb85dec972db5922c3e4efddeaea763 (patch) | |
| tree | 32fd0eb2c34334b7806726cf2dc9f8a893ea6fc8 /innobase/include/Makefile.i | |
| parent | fa14d89ea97346f49b5244faaeef137385c6e897 (diff) | |
| parent | acc178bf9ad680fad9b4bc3c68a7d4ee38692459 (diff) | |
| download | mariadb-git-20cda0b8afb85dec972db5922c3e4efddeaea763.tar.gz | |
Merged with 3.23, needs further fix-up
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
include/myisam.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
Auto merged
client/mysqltest.c:
Auto merged
sql/lex.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.h:
Auto merged
Docs/manual.texi:
merged
client/errmsg.c:
merged
configure.in:
merged
sql/mysqld.cc:
merged
sql/sql_select.cc:
merged, needs manual fixing
sql/sql_yacc.yy:
merged, needs manual fixing
Diffstat (limited to 'innobase/include/Makefile.i')
| -rw-r--r-- | innobase/include/Makefile.i | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/innobase/include/Makefile.i b/innobase/include/Makefile.i index 91dd9892bdf..8c7e9910f26 100644 --- a/innobase/include/Makefile.i +++ b/innobase/include/Makefile.i @@ -4,7 +4,5 @@ libsdir = ../libs INCLUDES = -I../../include -I../include -CFLAGS= -g -O2 -DDEBUG_OFF - # Don't update the files from bitkeeper %::SCCS/s.% |