database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita


sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown
2005-03-24 15:44:50 +01:00
parent ca68bca8f4 23da6e5e31
commit e6717497e4
8 changed files with 63 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libmysql/Makefile.shared
View File

@ -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=