Commit 71f35607 authored by unknown's avatar unknown

Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

parents 33f02393 b80049a5
......@@ -13,11 +13,11 @@ commands="\
$make -k clean || true
/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache
if [ ! aclocal ] ; then echo \"Can't execute aclocal\" ; exit 1; fi
if [ ! autoheader ] ; then echo \"Can't execute autoheader\" ; exit 1; fi
if [ ! aclocal ] ; then echo \"Can't execute aclocal\" ; exit 1; fi
if [ ! automake ] ; then echo \"Can't execute automake\" ; exit 1; fi
if [ ! autoconf ] ; then echo \"Can't execute autoconf\" ; exit 1; fi
aclocal || (echo \"Can't execute aclocal\" && exit 1)
autoheader || (echo \"Can't execute autoheader\" && exit 1)
aclocal || (echo \"Can't execute aclocal\" && exit 1)
automake || (echo \"Can't execute automake\" && exit 1)
autoconf || (echo \"Can't execute autoconf\" && exit 1)
(cd bdb/dist && sh s_all)
(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
if [ -d gemini ]
......
Docs/Images/mysql-logo.gif

3.01 KB | W: 0px | H: 0px

Docs/Images/mysql-logo.gif

12.9 KB | W: 0px | H: 0px

  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -633,7 +633,7 @@ static uint getTableStructure(char *table, char* db)
if (verbose)
fprintf(stderr, "-- Retrieving table structure for table %s...\n", table);
sprintf(insert_pat,"SET OPTION SQL_QUOTE_SHOW_CREATE=%d", opt_quoted);
sprintf(insert_pat,"SET OPTION SQL_QUOTE_SHOW_CREATE=%d", (opt_quoted || opt_keywords));
table_name=quote_name(table,table_buff);
if (!mysql_query(sock,insert_pat))
{
......
......@@ -322,7 +322,11 @@ install -m755 $MBD/support-files/mysql.server $RBR/etc/init.d/mysql
# (safe_mysqld will be gone in MySQL 4.1)
ln -sf ./mysqld_safe $RBR/usr/bin/safe_mysqld
%pre
# Touch the place where the my.cnf config file might be located
# Just to make sure it's in the file list and marked as a config file
touch $RBR/etc/my.cnf
%pre server
# Shut down a previously installed server first
if test -x /etc/init.d/mysql
then
......@@ -336,13 +340,13 @@ then
sleep 5
fi
%post
%post server
mysql_datadir=/var/lib/mysql
# Create data directory if needed
if test ! -d $mysql_datadir; then mkdir $mysql_datadir; fi
if test ! -d $mysql_datadir/mysql; then mkdir $mysql_datadir/mysql; fi
if test ! -d $mysql_datadir/test; then mkdir $mysql_datadir/test; fi
if test ! -d $mysql_datadir; then mkdir -m755 $mysql_datadir; fi
if test ! -d $mysql_datadir/mysql; then mkdir $mysql_datadir/mysql; fi
if test ! -d $mysql_datadir/test; then mkdir $mysql_datadir/test; fi
# Make MySQL start/shutdown automatically when the machine does it.
# use insserv for older SuSE Linux versions
......@@ -384,7 +388,7 @@ sleep 2
echo "Restarting mysqld."
/etc/init.d/mysql restart > /dev/null 2>&1
%preun
%preun server
if test $1 = 0
then
# Stop MySQL before uninstalling it
......@@ -430,6 +434,8 @@ fi
%doc %attr(644, root, man) %{_mandir}/man1/perror.1*
%doc %attr(644, root, man) %{_mandir}/man1/replace.1*
%ghost %config(noreplace,missingok) /etc/my.cnf
%attr(755, root, root) /usr/bin/isamchk
%attr(755, root, root) /usr/bin/isamlog
%attr(755, root, root) /usr/bin/my_print_defaults
......@@ -529,6 +535,12 @@ fi
%changelog
* Tue Feb 11 2003 Lenz Grimmer <lenz@mysql.com>
- re-added missing pre- and post(un)install scripts to server subpackage
- added config file /etc/my.cnf to the file list (just for completeness)
- make sure to create the datadir with 755 permissions
* Mon Jan 27 2003 Lenz Grimmer <lenz@mysql.com>
- removed unused CC and CXX variables
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment