← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/query_id.h

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/query_id.h
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#ifndef DRIZZLED_GLOBAL_QUERY_ID_H
21
 
#define DRIZZLED_GLOBAL_QUERY_ID_H
 
20
#ifndef DRIZZLED_QUERY_ID_H
 
21
#define DRIZZLED_QUERY_ID_H
22
22
 
23
23
#include <pthread.h>
24
24
#include <drizzled/atomics.h>
46
46
  Query_id& operator=(Query_id const&);
47
47
};
48
48
 
49
 
#endif
 
49
#endif /* DRIZZLED_QUERY_ID_H */