diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-02 21:26:16 +0200 |
| commit | 1c6ad62a269a3a03d8a343e1412876e04e9e9c37 (patch) | |
| tree | 1e837eb728452ebaf749b5f9eedc018404798ed6 /sql/sys_vars.cc | |
| parent | 14200dfa43756a0f9cb50c0b5d47d99b4fb1b6fa (diff) | |
| parent | e9b2f5bf15281583b38a56b12f9ae2420c46a6d1 (diff) | |
| download | mariadb-git-1c6ad62a269a3a03d8a343e1412876e04e9e9c37.tar.gz | |
mysql-5.5.39 merge
~40% bugfixed(*) applied
~40$ bugfixed reverted (incorrect or we're not buggy)
~20% bugfixed applied, despite us being not buggy
(*) only changes in the server code, e.g. not cmakefiles
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 d82c8f30ed2..cb35d334f9d 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. +/* Copyright (c) 2002, 2014, Oracle and/or its affiliates. Copyright (c) 2012, 2014, SkySQL Ab. This program is free software; you can redistribute it and/or modify @@ -2444,9 +2444,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( |