Commit c108939d authored by unknown's avatar unknown
Browse files

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


extra/Makefile.am:
  Auto merged
mysql-test/t/disabled.def:
  Merged from 5.0
sql/handler.cc:
  Merged from 5.0
sql/mysqld.cc:
  Merged from 5.0
parents b141917a 700e6cbd

extra/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ SUBDIRS= 
DIST_SUBDIRS=           yassl



# This will build mysqld_error.h and sql_state.h

$(top_builddir)/include/mysqld_error.h: comp_err

	$(top_builddir)/extra/comp_err \

$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)

	$(top_builddir)/extra/comp_err$(EXEEXT) \

	--charset=$(top_srcdir)/sql/share/charsets \

	--out-dir=$(top_builddir)/sql/share/ \

	--header_file=$(top_builddir)/include/mysqld_error.h \

mysql-test/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -18,3 +18,4 @@ func_group : Bug #15448 
func_math       : Bug #15448

group_min_max   : Bug #15448 

mysqlslap       : Bug #15483

subselect       : Bug #15706

support-files/mysql.server.sh

+8 −2
Original line number Diff line number Diff line
@@ -56,12 +56,18 @@ if test -z "$basedir" 
then

  basedir=@prefix@

  bindir=@bindir@

  if test -z "$datadir"

  then

    datadir=@localstatedir@

  fi

  sbindir=@sbindir@

  libexecdir=@libexecdir@

else

  bindir="$basedir/bin"

  if test -z "$datadir"

  then

    datadir="$basedir/data"

  fi

  sbindir="$basedir/sbin"

  libexecdir="$basedir/libexec"

fi