diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-03-03 12:34:33 +0200 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-03-03 12:34:33 +0200 |
| commit | b67892cf59872867514709784c54526434784ea9 (patch) | |
| tree | c44fac323326449cfbb40712cccac6feeca5d809 /storage/innobase | |
| parent | e667c0f926deaa7ce7f093cd4679431599c55b1f (diff) | |
| download | mariadb-git-b67892cf59872867514709784c54526434784ea9.tar.gz | |
Turn all new features off by default.
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 8 | ||||
| -rw-r--r-- | storage/innobase/srv/srv0srv.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 6b44cb96677..2ec17049434 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -16591,8 +16591,8 @@ static MYSQL_SYSVAR_BOOL(compress_index_pages, srv_page_compress_index_pages, static MYSQL_SYSVAR_BOOL(use_trim, srv_use_trim, PLUGIN_VAR_OPCMDARG, - "Use trim.", - NULL, NULL, TRUE); + "Use trim. Default FALSE.", + NULL, NULL, FALSE); #ifdef HAVE_LZ4 static MYSQL_SYSVAR_BOOL(use_lz4, srv_use_lz4, @@ -16612,8 +16612,8 @@ static MYSQL_SYSVAR_LONG(mtflush_threads, srv_mtflush_threads, static MYSQL_SYSVAR_BOOL(use_mtflush, srv_use_mtflush, PLUGIN_VAR_OPCMDARG , - "Use multi-threaded flush. Default TRUE.", - NULL, NULL, TRUE); + "Use multi-threaded flush. Default FALSE.", + NULL, NULL, FALSE); static struct st_mysql_sys_var* innobase_system_variables[]= { MYSQL_SYSVAR(additional_mem_pool_size), diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index 7d3e7bf8108..6a0abdbf148 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -152,7 +152,7 @@ UNIV_INTERN my_bool srv_page_compress_index_pages = FALSE; UNIV_INTERN long srv_trim_pct = 100; /* If this flag is TRUE, then we will use fallocate(PUCH_HOLE) to the pages */ -UNIV_INTERN my_bool srv_use_trim = TRUE; +UNIV_INTERN my_bool srv_use_trim = FALSE; /* If this flag is TRUE, then we will use posix fallocate for file extentsion */ UNIV_INTERN my_bool srv_use_posix_fallocate = FALSE; /* If this flag is TRUE, then we disable doublewrite buffer */ @@ -162,7 +162,7 @@ UNIV_INTERN my_bool srv_use_lz4 = FALSE; /* Number of threads used for multi-threaded flush */ UNIV_INTERN long srv_mtflush_threads = MTFLUSH_DEFAULT_WORKER; /* If this flag is TRUE, then we will use multi threaded flush. */ -UNIV_INTERN my_bool srv_use_mtflush = TRUE; +UNIV_INTERN my_bool srv_use_mtflush = FALSE; #ifdef __WIN__ /* Windows native condition variables. We use runtime loading / function |