diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2014-06-19 16:47:41 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2014-06-19 16:47:41 +0200 |
| commit | 1f1c0faffdabff36e6ccc5b2f0b90aeedb93580a (patch) | |
| tree | 646c204bc9903a546ff0ec2d2f9653d31c69dd11 /sql/sys_vars.cc | |
| parent | 6907449d42b14732d5d41c086add71490c2dfe64 (diff) | |
| download | mariadb-git-1f1c0faffdabff36e6ccc5b2f0b90aeedb93580a.tar.gz | |
WL#7436: Deprecate and remove timed_mutexes system variable
This is the 5.5/5.6 version of the patch.
Add deprecation warning for timed_mutexes.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 63f478be5f0..f8b2c022ba5 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -2241,9 +2241,10 @@ static Sys_var_ulonglong Sys_tmp_table_size( static Sys_var_mybool Sys_timed_mutexes( "timed_mutexes", - "Specify whether to time mutexes (only InnoDB mutexes are currently " - "supported)", - GLOBAL_VAR(timed_mutexes), CMD_LINE(OPT_ARG), DEFAULT(0)); + "Specify whether to time mutexes. Deprecated, has no effect.", + GLOBAL_VAR(timed_mutexes), CMD_LINE(OPT_ARG), DEFAULT(0), + NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(NULL), ON_UPDATE(NULL), + DEPRECATED("")); static char *server_version_ptr; static Sys_var_charptr Sys_version( |