mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M51/mysql-5.1 libmysqld/Makefile.am: Auto merged netware/Makefile.am: Auto merged scripts/Makefile.am: Auto merged BitKeeper/deleted/.del-Makefile.am~2: Auto merged client/Makefile.am: Merge does not fit - to be done manually.
This commit is contained in: