diff options
author | unknown <mikef@nslinux.bedford.progress.com> | 2001-03-21 15:34:16 -0500 |
---|---|---|
committer | unknown <mikef@nslinux.bedford.progress.com> | 2001-03-21 15:34:16 -0500 |
commit | b4098ead8324790a52a70b4b35a3e83bc4c7ed54 (patch) | |
tree | 5306fccfc0c0c42aabf0e2dd6bf883cdecc3ed03 /sql/Makefile.am | |
parent | 4b56b0ee43843dae2f5503718bd851f8debbd561 (diff) | |
download | mariadb-git-b4098ead8324790a52a70b4b35a3e83bc4c7ed54.tar.gz |
Add support for Gemini table handler, Monty has checked and approved
Fix bug when read return error
acconfig.h:
Add Gemini to configure
acinclude.m4:
Add Gemini to configure
include/my_base.h:
Add error codes for tables handlers
mysql-test/t/select.test:
Force temporary tables to MyISAM
sql-bench/server-cfg.sh:
Allow Gemini to run sql-bench
sql/Makefile.am:
Add Gemini to configure
sql/handler.cc:
Add support for Gemini table handler
sql/handler.h:
Add support for Gemini table handler
sql/lex.h:
Add support for Gemini table handler
sql/mysqld.cc:
Add support for Gemini table handler
sql/opt_range.cc:
Fix bug when read return error
sql/records.cc:
Fix bug when read return error
sql/sql_class.cc:
Add support for Gemini table handler
sql/sql_class.h:
Add support for Gemini table handler
sql/sql_lex.h:
Add support for Gemini table handler
sql/sql_rename.cc:
Add commit for table rename
sql/sql_table.cc:
Add commit for table rename
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r-- | sql/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 7d4fd86878a..7ddb88f26ed 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -21,7 +21,7 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) INCLUDES = @MT_INCLUDES@ \ - @bdb_includes@ @innobase_includes@ \ + @bdb_includes@ @innobase_includes@ @gemini_includes@ \ -I$(srcdir)/../include \ -I$(srcdir)/../regex \ -I$(srcdir) -I../include -I.. -I. @@ -40,7 +40,7 @@ LDADD = ../isam/libnisam.a \ ../regex/libregex.a \ ../strings/libmystrings.a mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ - @bdb_libs@ @innobase_libs@ \ + @bdb_libs@ @innobase_libs@ @gemini_libs@ \ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h item_uniq.h \ @@ -50,7 +50,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ field.h handler.h \ ha_isammrg.h ha_isam.h ha_myisammrg.h\ ha_heap.h ha_myisam.h ha_berkeley.h ha_innobase.h \ - opt_range.h opt_ft.h \ + ha_gemini.h opt_range.h opt_ft.h \ sql_select.h structs.h table.h sql_udf.h hash_filo.h\ lex.h lex_symbol.h sql_acl.h sql_crypt.h md5.h \ log_event.h mini_client.h sql_repl.h slave.h @@ -71,7 +71,7 @@ mysqld_SOURCES = sql_lex.cc \ records.cc filesort.cc handler.cc \ ha_isam.cc ha_isammrg.cc ha_heap.cc \ ha_myisam.cc ha_myisammrg.cc ha_berkeley.cc \ - ha_innobase.cc \ + ha_innobase.cc ha_gemini.cc \ sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \ sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \ sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \ |