Changeset 30184


Ignore:
Timestamp:
2012-02-05T04:38:32+01:00 (4 years ago)
Author:
jow
Message:

[packages_10.03.2] mysql: merge r28083, r29176, r29199, r29908

Location:
branches/packages_10.03.2/libs/mysql
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/libs/mysql/Makefile

    r26540 r30184  
    11# 
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2006-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=mysql 
    1111PKG_VERSION:=5.1.53 
    12 PKG_RELEASE:=2 
     12PKG_RELEASE:=6 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    3030  SECTION:=libs 
    3131  CATEGORY:=Libraries 
    32   DEPENDS:=+zlib 
     32  DEPENDS:=+uclibcxx +zlib 
    3333  TITLE:=MySQL client library 
    3434  URL:=http://dev.mysql.com/ 
     
    3838  SECTION:=utils 
    3939  CATEGORY:=Utilities 
    40   DEPENDS:=+zlib +libmysqlclient +uclibcxx 
     40  DEPENDS:=+libmysqlclient +libncurses +libreadline 
    4141  TITLE:=MySQL Server 
    4242  URL:=http://dev.mysql.com/ 
     
    196196endef 
    197197 
     198define Package/mysql-server/conffiles 
     199/etc/my.cnf 
     200endef 
     201 
    198202$(eval $(call BuildPackage,mysql-server)) 
    199203$(eval $(call BuildPackage,libmysqlclient)) 
  • branches/packages_10.03.2/libs/mysql/files/mysqld.init

    r25243 r30184  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2010 OpenWrt.org 
     2# Copyright (C) 2010-2011 OpenWrt.org 
    33 
    44START=95 
    55STOP=10 
    66 
    7 PID=/var/run/mysqld.pid 
    8 CMD=/usr/bin/mysqld 
     7SERVICE_DAEMONIZE=1 
     8SERVICE_WRITE_PID=1 
     9SERVICE_STOP_TIME=9 
     10 
     11error() { 
     12        echo "${initscript}:" "$@" 1>&2 
     13} 
    914 
    1015start() { 
    1116        local datadir=$(sed -n -e "s/^[[:space:]]*datadir[[:space:]]*=[[:space:]]*[\"']\?\([^\"']*\)[\"']\?/\1/p" /etc/my.cnf) 
    1217        if [ ! -d "$datadir" ]; then 
    13                 echo "Error: datadir in /etc/my.cnf ($datadir) doesn't exist" 
     18                error "Error: datadir '$datadir' in /etc/my.cnf doesn't exist" 
    1419                return 1 
    15         elif [ ! -f "$datadir/mysql/tables_priv.MYD" ]; then 
    16                 echo "Error: I didn't detect a privileges table, you might need to run mysql_install_db --force to initialize the system tables" 
     20        fi 
     21        if [ ! -f "$datadir/mysql/tables_priv.MYD" ]; then 
     22                error "Error: I didn't detect a privileges table, you might need to run mysql_install_db --force to initialize the system tables" 
    1723                return 1 
    18         else 
    19                 echo -n "Starting MySQL daemon... " 
    20                 start-stop-daemon -x $CMD -b -S -- --pid-file=$PID 
    21                 echo "done" 
    2224        fi 
     25        service_start /usr/bin/mysqld 
    2326} 
    2427 
    2528stop() { 
    26         echo -n "Stopping MySQL daemon... " 
    27         service_kill ${CMD##*/} $PID 
    28         echo "done" 
     29        service_stop /usr/bin/mysqld 
    2930} 
Note: See TracChangeset for help on using the changeset viewer.