summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-28 10:55:44 +0300
committerAlexander Nozdrin <alik@sun.com>2009-10-28 10:55:44 +0300
commit22fe8e10e297c40bc88104fb6a13e5183238850e (patch)
tree76a0977cebe3775f61ae3281cc608601eb883243 /sql/sql_select.h
parenta4068d17fdf56ee79e4d538d47799ca0eeb67de3 (diff)
parentcd6e15989044e5d4a708a6ee191bcd3c13dc0071 (diff)
downloadmariadb-git-22fe8e10e297c40bc88104fb6a13e5183238850e.tar.gz
Merge from mysql-next-mr.
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 8ea7833d853..853931f437a 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -1,3 +1,6 @@
+#ifndef SQL_SELECT_INCLUDED
+#define SQL_SELECT_INCLUDED
+
/* Copyright (C) 2000-2006 MySQL AB
This program is free software; you can redistribute it and/or modify
@@ -757,3 +760,4 @@ inline bool optimizer_flag(THD *thd, uint flag)
return (thd->variables.optimizer_switch & flag);
}
+#endif /* SQL_SELECT_INCLUDED */