diff options
| author | unknown <gbichot@quadita2.mysql.com> | 2005-03-24 14:32:40 +0100 |
|---|---|---|
| committer | unknown <gbichot@quadita2.mysql.com> | 2005-03-24 14:32:40 +0100 |
| commit | 23da6e5e3161b66286b19f423d8bb0dbae0572ed (patch) | |
| tree | 1c70ef9270a90b0bd16be031467493ef431cad61 /libmysql | |
| parent | b350fefdcabc77c69fb060d088bcb8e259891788 (diff) | |
| parent | 2621e38bf950879dd339d780d565f44df837c8c4 (diff) | |
| download | mariadb-git-23da6e5e3161b66286b19f423d8bb0dbae0572ed.tar.gz | |
merge from 4.1
BitKeeper/etc/logging_ok:
auto-union
libmysql/Makefile.shared:
Auto merged
mysql-test/r/rpl_deadlock.result:
Auto merged
mysql-test/t/rpl_deadlock.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/structs.h:
Auto merged
sql/slave.cc:
merge
sql/slave.h:
merge
sql/sql_show.cc:
merge
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.shared | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 50dedebe119..204c833dd21 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -96,7 +96,8 @@ clean-local: `echo $(sql_cmn_objects) | sed "s;\.lo;.c;g"` \ $(CHARSET_SRCS) $(CHARSET_OBJS) \ $(mystringsextra) $(mysysheaders) $(vioheaders)\ - ../linked_client_sources net.c + ../linked_libmysql_sources ../linked_libmysql_r_sources \ + net.c conf_to_src_SOURCES = conf_to_src.c conf_to_src_LDADD= |