diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-25 15:31:07 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-25 15:31:07 +0200 |
| commit | 49e0eea578eb119cafb2df1ba77b35fcf8391224 (patch) | |
| tree | 45f7768e20be3d146b414bb9b770a956b9601f78 /Makefile.am | |
| parent | db47e4ca2479a8e7bde91757fa968c462ca2a343 (diff) | |
| parent | 4886e3d2d4e05faba9f13869c5e0e3b4dc6a7c1c (diff) | |
| download | mariadb-git-49e0eea578eb119cafb2df1ba77b35fcf8391224.tar.gz | |
Merge with 3.23.55
BitKeeper/deleted/.del-net.c~ef21d6402bb882f9:
Auto merged
innobase/os/os0file.c:
Auto merged
libmysql/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Build-tools/Do-compile:
Use local version
Makefile.am:
remove double libmysql_r
configure.in:
Use local
libmysql/libmysql.c:
Dont abort connection if too big packet error
sql/ha_innodb.cc:
use local
sql/net_serv.cc:
use local
sql/sql_parse.cc:
Merge with 3.23.55 (fix double free of user)
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 7949e7be776..d3d50e9638f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ EXTRA_DIST = INSTALL-SOURCE README \ SUBDIRS = . include @docs_dirs@ @readline_dir@ \ @thread_dirs@ pstack @sql_client_dirs@ \ @sql_server_dirs@ scripts man tests \ - BUILD os2 libmysql_r @libmysqld_dirs@ \ + BUILD os2 @libmysqld_dirs@ \ @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ # Relink after clean |