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

Fixes for stuff seen in buildbot:

Browse Source 
- Fix embedded build

 - Backport disable of fallocate, it creates too short ibdata1
   when used with O_DIRECT on old kernels

 - Do not disable innodb during .deb install, we need it for
   mysql.rpl_slave_state table.
This commit is contained in:
unknown 2013-04-16 17:36:40 +02:00
parent 82eedf4e97
commit 0508f766b4
5 changed files with 5 additions and 4 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 --default-storage-engine=myisam" MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --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 --default-storage-engine=myisam" MYSQL_BOOTSTRAP="/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables --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

1
sql/sys_vars.h
View File

@ -552,6 +552,7 @@ protected:
} }
}; };
class Master_info;
class Sys_var_rpl_filter: public sys_var class Sys_var_rpl_filter: public sys_var
{ {
private: private:

2
storage/innobase/handler/ha_innodb.cc
View File

@ -2492,7 +2492,7 @@ innobase_change_buffering_inited_ok:
innobase_commit_concurrency_init_default(); innobase_commit_concurrency_init_default();
#ifdef HAVE_POSIX_FALLOCATE #ifdef HAVE_POSIX_FALLOCATE
srv_use_posix_fallocate = (ibool) innobase_use_fallocate; srv_use_posix_fallocate = 0 && (ibool) innobase_use_fallocate;
#endif #endif
srv_use_atomic_writes = (ibool) innobase_use_atomic_writes; srv_use_atomic_writes = (ibool) innobase_use_atomic_writes;
if (innobase_use_atomic_writes) { if (innobase_use_atomic_writes) {

2
storage/xtradb/handler/ha_innodb.cc
View File

@ -3082,7 +3082,7 @@ innobase_change_buffering_inited_ok:
#endif #endif
#ifdef HAVE_POSIX_FALLOCATE #ifdef HAVE_POSIX_FALLOCATE
srv_use_posix_fallocate = (ibool) innobase_use_fallocate; srv_use_posix_fallocate = 0 && (ibool) innobase_use_fallocate;
#endif #endif
srv_use_atomic_writes = (ibool) innobase_use_atomic_writes; srv_use_atomic_writes = (ibool) innobase_use_atomic_writes;
if (innobase_use_atomic_writes) { if (innobase_use_atomic_writes) {