mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 17:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge with 3.23

Browse source 
BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
libmysql/password.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_static.c:
  Auto merged
mysys/my_static.h:
  Auto merged
mysys/my_tempnam.c:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
mysql-test/t/temp_table.test:
  Added comment
sql/mysqld.cc:
  Don't apply change from 3.23
sql/sql_show.cc:
  Don't apply change from 3.23
sql/structs.h:
  Don't apply change from 3.23
This commit is contained in:
unknown 2002-12-05 03:52:53 +02:00
commit 5fdd9f878f
4 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
support-files/mysql.server.sh
View file

@ -79,7 +79,8 @@ parse_arguments() {
done
}
# Get arguments from the my.cnf file, groups [mysqld] and [mysql_server]
# Get arguments from the my.cnf file,
# groups [mysqld] [mysql_server] and [mysql.server]
if test -x ./bin/my_print_defaults
then
print_defaults="./bin/my_print_defaults"
@ -117,7 +118,7 @@ else
test -z "$print_defaults" && print_defaults="my_print_defaults"
fi
parse_arguments `$print_defaults $defaults mysqld mysql_server`
parse_arguments `$print_defaults mysqld mysql_server mysql.server`
# Safeguard (relative paths, core dumps..)
cd $basedir