diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:55:44 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-28 10:55:44 +0300 |
| commit | 22fe8e10e297c40bc88104fb6a13e5183238850e (patch) | |
| tree | 76a0977cebe3775f61ae3281cc608601eb883243 /libmysql | |
| parent | a4068d17fdf56ee79e4d538d47799ca0eeb67de3 (diff) | |
| parent | cd6e15989044e5d4a708a6ee191bcd3c13dc0071 (diff) | |
| download | mariadb-git-22fe8e10e297c40bc88104fb6a13e5183238850e.tar.gz | |
Merge from mysql-next-mr.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/client_settings.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index ec63f495552..aaec08d1b1e 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -13,6 +13,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef CLIENT_SETTINGS_INCLUDED +#define CLIENT_SETTINGS_INCLUDED +#else +#error You have already included an client_settings.h and it should not be included twice +#endif /* CLIENT_SETTINGS_INCLUDED */ + extern uint mysql_port; extern char * mysql_unix_port; |