← Back to branch summary

~xnox/ubuntu/saucy/drizzle/merge

« back to all changes in this revision

Viewing changes to drizzled/internal/mf_qsort.cc

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-06-19 10:46:49 UTC
  • mfrom: (1.2.11) (2.1.16 sid)
  • Revision ID: package-import@ubuntu.com-20120619104649-9ij634mxm4x8pp4l
Tags: 1:7.1.36-stable-1ubuntu1
https://launchpad.net/bugs/987575
* Merge from Debian unstable. (LP: #987575)
  Remaining changes:
  - Added upstart script.
* debian/drizzle.upstart: dropped logger since upstart logs job
  output now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/mf_qsort.cc
25
25
#include <drizzled/internal/my_sys.h>
26
26
#include <drizzled/internal/m_string.h>
27
27
 
28
 
namespace drizzled
29
 
{
30
 
namespace internal
31
 
{
 
28
namespace drizzled {
 
29
namespace internal {
32
30
 
33
31
/* We need to use qsort with 2 different compare functions */
34
32
#ifdef QSORT_EXTRA_CMP_ARGUMENT