diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-06 14:06:11 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-06 14:06:11 -0400 |
| commit | ec91eea8dbae4276ff6e31a0d80c0b523f88ed88 (patch) | |
| tree | 8d1b9adecf56764c4198a42c3df6dbb1096ce49a /sql/sys_vars.cc | |
| parent | e4e55f7968d961e0cb07800397bc3108f960956a (diff) | |
| parent | c722e5f25f1f00b32f9b4b556f07489bda38095a (diff) | |
| download | mariadb-git-ec91eea8dbae4276ff6e31a0d80c0b523f88ed88.tar.gz | |
Local merge of mariadb-5.5.39
bzr merge -r4264 maria/5.5
Text conflict in sql/mysqld.cc
Text conflict in storage/xtradb/btr/btr0cur.c
Text conflict in storage/xtradb/buf/buf0buf.c
Text conflict in storage/xtradb/buf/buf0lru.c
Text conflict in storage/xtradb/handler/ha_innodb.cc
5 conflicts encountered.
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 3abfec66364..fff4773f5de 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 @@ -2464,9 +2464,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( |