diff options
author | unknown <monty@mysql.com> | 2004-03-19 13:04:46 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-03-19 13:04:46 +0200 |
commit | 00ff1f609ea0500d6701db2e8b7dd34374d099c5 (patch) | |
tree | cdac7298a46b367654bd1750f7cfa228498025a3 /include | |
parent | b54698374b5eea922a6f054338d804c2ba3aa682 (diff) | |
parent | c6a059964271c2b1cb7dc9905d9b708770d1278f (diff) | |
download | mariadb-git-00ff1f609ea0500d6701db2e8b7dd34374d099c5.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
Diffstat (limited to 'include')
-rw-r--r-- | include/errmsg.h | 1 | ||||
-rw-r--r-- | include/mysql_version.h.in | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/errmsg.h b/include/errmsg.h index 5136af5b87a..24ebe24d786 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -63,4 +63,5 @@ extern const char *client_errors[]; /* Error messages */ #define CR_PROBE_MASTER_CONNECT 2025 #define CR_SSL_CONNECTION_ERROR 2026 #define CR_MALFORMED_PACKET 2027 +#define CR_WRONG_LICENSE 2028 diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index 41d4ce081fb..de5294a82cf 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -26,4 +26,9 @@ #define MYSQL_CHARSET "@default_charset@" #endif /* MYSQL_CHARSET */ #endif /* _CUSTOMCONFIG_ */ + +#ifndef LICENSE +#define LICENSE "GPL" +#endif /* LICENSE */ + #endif /* _mysql_version_h */ |