Commit 697978b5 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

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

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
parents d57b95b6 702702e9
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
# MySQL.
#
# You can copy this file to
# /etc/mf.cnf to set global options,
# /etc/my.cnf to set global options,
# mysql-data-dir/my.cnf to set server-specific options (in this
# installation this directory is @localstatedir@) or
# ~/.my.cnf to set user-specific options.
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
# MySQL.
#
# You can copy this file to
# /etc/mf.cnf to set global options,
# /etc/my.cnf to set global options,
# mysql-data-dir/my.cnf to set server-specific options (in this
# installation this directory is @localstatedir@) or
# ~/.my.cnf to set user-specific options.
+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
# other programs (like a web server)
#
# You can copy this file to
# /etc/mf.cnf to set global options,
# /etc/my.cnf to set global options,
# mysql-data-dir/my.cnf to set server-specific options (in this
# installation this directory is @localstatedir@) or
# ~/.my.cnf to set user-specific options.
+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
# doesn't use much resources.
#
# You can copy this file to
# /etc/mf.cnf to set global options,
# /etc/my.cnf to set global options,
# mysql-data-dir/my.cnf to set server-specific options (in this
# installation this directory is @localstatedir@) or
# ~/.my.cnf to set user-specific options.