← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/defs_ms.h

  • Committer: Barry.Leslie at PrimeBase
  • Date: 2010-10-18 21:21:20 UTC
  • mto: This revision was merged to the branch mainline in revision 1871.
  • Revision ID: barry.leslie@primebase.com-20101018212120-dqukgtkwhb1imt1o
Merged changes from lp:pbms. These changes should remove any danger
of longjmp() clobbering local variables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/defs_ms.h
28
28
#ifndef __DEFS_MS_H__
29
29
#define __DEFS_MS_H__
30
30
 
31
 
#include <boost/dynamic_bitset.hpp>
32
 
 
33
31
#include "cslib/CSDefs.h"
34
32
 
35
33
#define MS_IDENTIFIER_CHAR_COUNT        64
117
115
#define MS_DEFAULT_KEEP_ALIVE           (10) 
118
116
 
119
117
#ifdef DRIZZLED
 
118
#include <boost/dynamic_bitset.hpp>
120
119
/* Drizzle is stuck at this level: */
121
120
#define MYSQL_VERSION_ID                                        60005
122
121