summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
diff options
context:
space:
mode:
authorMagne Mahre <magne.mahre@oracle.com>2011-01-11 10:07:37 +0100
committerMagne Mahre <magne.mahre@oracle.com>2011-01-11 10:07:37 +0100
commitebd24626ca38e7fa1e3da2acdcf88540be70fabe (patch)
tree5aa89e155e701ad4709cbd1e6a9efc5b5f1bb755 /sql/filesort.cc
parentf6bcd9c6c5d860c9a6ad1b6411ffa9f48ed685c9 (diff)
downloadmariadb-git-ebd24626ca38e7fa1e3da2acdcf88540be70fabe.tar.gz
Remove configuration preprocessor symbols 'THREAD'
and 'THREAD_SAFE_CLIENT'. As of MySQL 5.5, we no longer support non-threaded builds. This patch removes all references to the obsolete THREAD and THREAD_SAFE_CLIENT preprocessor symbols. These were used to distinguish between threaded and non-threaded builds.
Diffstat (limited to 'sql/filesort.cc')
-rw-r--r--sql/filesort.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc
index 419f18263cc..f888206f730 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB, 2008-2009 Sun Microsystems, Inc
+/* Copyright (c) 2000, 2011, 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
@@ -33,10 +33,6 @@
#include "sql_test.h" // TEST_filesort
#include "opt_range.h" // SQL_SELECT
-#ifndef THREAD
-#define SKIP_DBUG_IN_FILESORT
-#endif
-
/// How to write record_ref.
#define WRITE_REF(file,from) \
if (my_b_write((file),(uchar*) (from),param->ref_length)) \