Skip to content

Commit

Permalink
Turn all new features off by default.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Lindström committed Mar 3, 2014
1 parent e667c0f commit b67892c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions storage/innobase/handler/ha_innodb.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions storage/innobase/srv/srv0srv.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions storage/xtradb/handler/ha_innodb.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17952,8 +17952,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,
Expand All @@ -17973,8 +17973,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(log_block_size),
Expand Down
4 changes: 2 additions & 2 deletions storage/xtradb/srv/srv0srv.cc
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ level is set for the table*/
UNIV_INTERN long srv_compress_zlib_level = 6;
/* 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 */
Expand All @@ -180,7 +180,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
Expand Down

0 comments on commit b67892c

Please sign in to comment.