← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled_safe.in

  • Committer: Grant Limberg
  • Date: 2008-08-12 21:13:01 UTC
  • mto: (322.1.1 codestyle)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: grant@glsoftware.net-20080812211301-ym3wsowelkgp16s2
renamed all instances of MYSQL_ to DRIZZLE_

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled_safe.in
249
249
  DATADIR=@localstatedir@
250
250
fi
251
251
 
252
 
if test -z "$MYSQL_HOME"
 
252
if test -z "$DRIZZLE_HOME"
253
253
then 
254
254
  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
255
255
  then
258
258
$DATADIR/my.cnf
259
259
IGNORING $DATADIR/my.cnf"
260
260
 
261
 
    MYSQL_HOME=$MY_BASEDIR_VERSION
 
261
    DRIZZLE_HOME=$MY_BASEDIR_VERSION
262
262
  elif test -r "$DATADIR/my.cnf"
263
263
  then
264
264
    log_error "WARNING: Found $DATADIR/my.cnf
265
265
The data directory is a deprecated location for my.cnf, please move it to
266
266
$MY_BASEDIR_VERSION/my.cnf"
267
 
    MYSQL_HOME=$DATADIR
 
267
    DRIZZLE_HOME=$DATADIR
268
268
  else
269
 
    MYSQL_HOME=$MY_BASEDIR_VERSION
 
269
    DRIZZLE_HOME=$MY_BASEDIR_VERSION
270
270
  fi
271
271
fi
272
 
export MYSQL_HOME
 
272
export DRIZZLE_HOME
273
273
 
274
274
 
275
275
# Get first arguments from the my.cnf file, groups [drizzled] and [drizzled_safe]
383
383
  fi
384
384
fi
385
385
 
386
 
safe_mysql_unix_port=${mysql_unix_port:-${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}}
 
386
safe_mysql_unix_port=${mysql_unix_port:-${DRIZZLE_UNIX_PORT:-@DRIZZLE_UNIX_ADDR@}}
387
387
# Make sure that directory for $safe_mysql_unix_port exists
388
388
mysql_unix_port_dir=`dirname $safe_mysql_unix_port`
389
389
if [ ! -d $mysql_unix_port_dir ]