← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/display.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/display.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
 
21
#include "config.h"
22
22
 
23
23
#include <drizzled/display.h>
24
24
#include <drizzled/item.h>
134
134
  {
135
135
  case drizzled::COM_SLEEP : 
136
136
    return COM_SLEEP;
137
 
  case drizzled::COM_KILL : 
138
 
    {
139
 
      static std::string COM_KILL("COM_KILL");
140
 
      return COM_KILL;
141
 
    }
142
137
  case drizzled::COM_QUIT : 
143
138
    return COM_QUIT;
144
139
  case drizzled::COM_INIT_DB :