diff options
| author | unknown <hf@deer.(none)> | 2003-05-28 13:54:58 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-05-28 13:54:58 +0500 |
| commit | 7b2e06b281639a7d67d61da4545a292e831c94f5 (patch) | |
| tree | e58c9f81824de010188d299a9cdbb4d6794ec856 /libmysqld | |
| parent | 15b3f3a0d8c11babff0f2e4dfa81c1716bcf533d (diff) | |
| parent | a1e47ce8ee3746a6ecf05d8c4707bea914fa14be (diff) | |
| download | mariadb-git-7b2e06b281639a7d67d61da4545a292e831c94f5.tar.gz | |
Lots of conflicts resolved
libmysqld/Makefile.am:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
libmysql/libmysql.c:
Resolved conflicts
sql/mini_client.cc:
resolved conflicts
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 93702e5b6d0..781dadadd71 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -43,14 +43,14 @@ sqlsources = derror.cc field.cc field_conv.cc filesort.cc \ item.cc item_buff.cc item_cmpfunc.cc item_create.cc \ item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \ item_uniq.cc item_subselect.cc item_row.cc\ - key.cc lock.cc log.cc log_event.cc mf_iocache.cc\ - mini_client.cc protocol.cc net_serv.cc opt_ft.cc opt_range.cc \ + key.cc lock.cc log.cc log_event.cc \ + protocol.cc net_serv.cc opt_ft.cc opt_range.cc \ opt_sum.cc procedure.cc records.cc sql_acl.cc \ - repl_failsafe.cc slave.cc sql_load.cc sql_olap.cc \ + sql_load.cc sql_olap.cc \ sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \ sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \ sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc sql_parse.cc \ - sql_prepare.cc sql_derived.cc sql_rename.cc sql_repl.cc \ + sql_prepare.cc sql_derived.cc sql_rename.cc \ sql_select.cc sql_do.cc sql_show.cc set_var.cc \ sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \ sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \ |