1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-393. Remove --loose-pbxt=OFF/loose-skip-pbxt from bootstrapper calls to avoid "unknown parameter" warning

Browse Source
This commit is contained in:
Vladislav Vaintroub 2012-07-12 15:32:35 +02:00
parent a08631d696
commit 718bbcbfd0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/dist/Debian/mariadb-server-5.5.postinst vendored
View File

@ -21,7 +21,7 @@ invoke() {
fi fi
} }
MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --loose-pbxt=OFF --default-storage-engine=myisam" MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --default-storage-engine=myisam"
test_mysql_access() { test_mysql_access() {
mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1 mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1

2
debian/dist/Ubuntu/mariadb-server-5.5.postinst vendored
View File

@ -21,7 +21,7 @@ invoke() {
fi fi
} }
MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --loose-pbxt=OFF --default-storage-engine=myisam" MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --loose-innodb=OFF --default-storage-engine=myisam"
test_mysql_access() { test_mysql_access() {
mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1 mysql --no-defaults -u root -h localhost </dev/null >/dev/null 2>&1

2
sql/mysql_install_db.cc
View File

@ -247,7 +247,7 @@ static char *init_bootstrap_command_line(char *cmdline, size_t size)
"\"\"%s\" --no-defaults --bootstrap" "\"\"%s\" --no-defaults --bootstrap"
" \"--language=%s\\share\\english\"" " \"--language=%s\\share\\english\""
" --basedir=. --datadir=. --default-storage-engine=myisam" " --basedir=. --datadir=. --default-storage-engine=myisam"
" --max_allowed_packet=9M --loose-skip-innodb --loose-skip-pbxt" " --max_allowed_packet=9M --loose-skip-innodb"
" --net-buffer-length=16k\"", mysqld_path, basedir); " --net-buffer-length=16k\"", mysqld_path, basedir);
return cmdline; return cmdline;
} }