mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge five.local.lan:/work/trees/mysql-5.1-build-src-clean

Browse source 
into  five.local.lan:/work/merge/mysql-5.1-build


CMakeLists.txt:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
This commit is contained in:
unknown 2007-11-05 18:58:06 +01:00
commit 6a34440272
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -13,6 +13,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR)
PROJECT(MySql)
# This reads user configuration, generated by configure.js.

2
support-files/mysql.server.sh
View file

@ -314,7 +314,7 @@ case "$mode" in
fi
exit $return_value
else
log_failure_msg "Couldn't find MySQL manager or server"
log_failure_msg "Couldn't find MySQL manager ($manager) or server ($bindir/mysqld_safe)"
fi
;;