diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-09-29 17:20:26 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-09-29 17:20:26 -0600 |
| commit | e52e3167c79d874628c47a50d8c8e0210a263085 (patch) | |
| tree | 3530dd1027b626d08c49a4bd8d57ba24d8424c45 /sql/Makefile.am | |
| parent | 9ca5f114eade50b97308f711824fcfacd2135b72 (diff) | |
| download | mariadb-git-e52e3167c79d874628c47a50d8c8e0210a263085.tar.gz | |
bug fixes in server-id, moved replication functionality to
sql_repl.* will push this one, since the replication code now works
repl-tests/test-dump/run.test:
added slave/master reset
sql/Makefile.am:
added sql_repl.*
sql/log_event.cc:
moved #defines to log_event.h
sql/log_event.h:
moved #defines from log_event.cc
sql/mysql_priv.h:
added LOCK_server_id
sql/mysqlbinlog.cc:
added server id
sql/mysqld.cc:
added mutex_init for LOCK_server_id
sql/slave.cc:
added server_id to COM_BINLOG_DUMP
sql/sql_base.cc:
moved replication code to sql_repl.*
sql/sql_parse.cc:
moved replication code to sql_repl.*
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 58ab8f69304..20208b10da5 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -48,7 +48,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ opt_range.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 + log_event.h mini_client.h sql_repl.h mysqld_SOURCES = sql_lex.cc \ item.cc item_sum.cc item_buff.cc item_func.cc \ item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \ @@ -69,7 +69,7 @@ mysqld_SOURCES = sql_lex.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 \ - slave.cc \ + slave.cc sql_repl.cc \ md5.c log_event.cc mini_client.cc mini_client_errors.c gen_lex_hash_SOURCES = gen_lex_hash.cc gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) |