diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-10 14:33:34 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-01-10 14:33:34 +0400 |
| commit | 380ad35c20626a6a4a5f64d7b6039e80864efd7f (patch) | |
| tree | 05473d341013d234283d2874043160d5a8163d2d /sql | |
| parent | 42a7506d288a7666b666f9b514e7bbb2b1dc88dd (diff) | |
| parent | 6f3343eeb990d70c9f60bd6077615b93f8b5fc55 (diff) | |
| download | mariadb-git-380ad35c20626a6a4a5f64d7b6039e80864efd7f.tar.gz | |
Merge mysql.com:/d2/hf/common/my50-common
into mysql.com:/d2/hf/mr10/my50-mr10
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 95de1f91ecf..783bca70739 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -51,6 +51,10 @@ #define OPT_NDBCLUSTER_DEFAULT 0 #endif +#ifndef DEFAULT_SKIP_THREAD_PRIORITY +#define DEFAULT_SKIP_THREAD_PRIORITY 0 +#endif + #include <thr_alarm.h> #include <ft_global.h> #include <errmsg.h> @@ -5384,8 +5388,8 @@ Can't be set to 1 if --log-slave-updates is used.", {"skip-symlink", OPT_SKIP_SYMLINKS, "Don't allow symlinking of tables. Deprecated option. Use --skip-symbolic-links instead.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"skip-thread-priority", OPT_SKIP_PRIOR, - "Don't give threads different priorities.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, - 0, 0, 0, 0, 0}, + "Don't give threads different priorities.", 0, 0, 0, GET_NO_ARG, NO_ARG, + DEFAULT_SKIP_THREAD_PRIORITY, 0, 0, 0, 0, 0}, #ifdef HAVE_REPLICATION {"slave-load-tmpdir", OPT_SLAVE_LOAD_TMPDIR, "The location where the slave should put its temporary files when \ |