mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

Browse source 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
scripts/Makefile.am:
  Auto merged
sql/mysql_priv.h:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
client/mysql_upgrade.c:
  Use remote
mysql-test/r/mysql_upgrade.result:
  Use remote
Makefile.am:
  Merge "build scripts/ a little earlier"
include/my_global.h:
  Merge
This commit is contained in:
unknown 2007-04-18 14:18:55 +02:00
commit 6bfa5a40bc
10 changed files with 889 additions and 639 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -21,9 +21,9 @@ AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
@readline_topdir@ sql-common \
@readline_topdir@ sql-common scripts \
@thread_dirs@ pstack \
@sql_union_dirs@ unittest storage plugin \
@sql_union_dirs@ scripts unittest storage plugin \
@sql_server@ scripts @man_dirs@ tests \
netware @libmysqld_dirs@ \
mysql-test support-files sql-bench @tools_dirs@ \