summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authorlars/lthalmann@dl145j.mysql.com <>2006-09-11 13:34:44 +0200
committerlars/lthalmann@dl145j.mysql.com <>2006-09-11 13:34:44 +0200
commit1dfc84986e14d75679c1571ae2cc1caeb25ba4a3 (patch)
treef80b248bcf597dedabf6357709b641d65d21ae5b /sql/mysql_priv.h
parent28b90bfab5104efa3c1a4a80fb9e85b64880dabb (diff)
parentf480cb0d670c6ff91e6976fc7a41dea4cd9c8882 (diff)
downloadmariadb-git-1dfc84986e14d75679c1571ae2cc1caeb25ba4a3.tar.gz
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 473de1951e5..86f5c9a045a 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -21,6 +21,9 @@
except the part which must be in the server and in the client.
*/
+#ifndef MYSQL_PRIV_H
+#define MYSQL_PRIV_H
+
#ifndef MYSQL_CLIENT
#include <my_global.h>
@@ -2036,3 +2039,5 @@ bool schema_table_store_record(THD *thd, TABLE *table);
#endif /* MYSQL_SERVER */
#endif /* MYSQL_CLIENT */
+
+#endif /* MYSQL_PRIV_H */