diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-01-16 01:08:29 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-01-16 01:08:29 +0200 |
| commit | 40c146f6a22e7397d9e5d1880b29f2c88fb39eda (patch) | |
| tree | 04255ad8dbcf3e3e29807adb609c4e3e4da328eb /libmysqld | |
| parent | 62f9d3c201f8e8673041a365378f953107dd783e (diff) | |
| parent | f015cbdc7e3427cf0f77012c4ce89f3cf8d5dd5f (diff) | |
| download | mariadb-git-40c146f6a22e7397d9e5d1880b29f2c88fb39eda.tar.gz | |
merge
sql/mysqld.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 7c4197afb32..edee13c98bb 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -38,7 +38,7 @@ libmysqlsources = errmsg.c get_password.c password.c noinst_HEADERS = embedded_priv.h sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ - ha_innobase.cc ha_berkeley.cc ha_heap.cc ha_isam.cc ha_isammrg.cc \ + ha_innodb.cc ha_berkeley.cc ha_heap.cc ha_isam.cc ha_isammrg.cc \ ha_myisam.cc ha_myisammrg.cc handler.cc sql_handler.cc \ hostname.cc init.cc \ item.cc item_buff.cc item_cmpfunc.cc item_create.cc \ |