diff options
| author | unknown <monty@mysql.com> | 2004-05-25 02:47:25 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-25 02:47:25 +0300 |
| commit | 54a32091a13923471c1e1639edd0390ed19bc70f (patch) | |
| tree | cd40ef99e52fbe99be97d88ef663df2fa69b8ddb /include | |
| parent | 8855e70bb4affb3c75c8175491a977a2ebbd30df (diff) | |
| parent | 072d10443abaea2b78cbe3b60d334234ea2580df (diff) | |
| download | mariadb-git-54a32091a13923471c1e1639edd0390ed19bc70f.tar.gz | |
Merge with 4.0 to get fixes for Windows project files
VC++Files/client/mysql.dsp:
Auto merged
VC++Files/client/mysqladmin.dsp:
Auto merged
VC++Files/client/mysqldump.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/client/mysqlimport.dsp:
Auto merged
VC++Files/client/mysqlshow.dsp:
Auto merged
VC++Files/isamchk/isamchk.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
Auto merged
VC++Files/myisamchk/myisamchk.dsp:
Auto merged
VC++Files/myisamlog/myisamlog.dsp:
Auto merged
VC++Files/myisampack/myisampack.dsp:
Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
Auto merged
VC++Files/mysqlmanager/mysqlmanager.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/pack_isam/pack_isam.dsp:
Auto merged
VC++Files/perror/perror.dsp:
Auto merged
VC++Files/replace/replace.dsp:
Auto merged
include/my_global.h:
Auto merged
include/mysql_version.h.in:
Auto merged
innobase/eval/eval0eval.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
libmysql/libmysql.c:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/limits/mysql-4.0.cfg:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 3 | ||||
| -rw-r--r-- | include/mysql_version.h.in | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/include/my_global.h b/include/my_global.h index 6916ea61e19..fafe0425c55 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -338,6 +338,9 @@ C_MODE_END #define USE_BMOVE512 1 /* Use this unless system bmove is faster */ #endif +#define QUOTE_ARG(x) #x /* Quote argument (before cpp) */ +#define STRINGIFY_ARG(x) QUOTE_ARG(x) /* Quote argument, after cpp */ + /* Paranoid settings. Define I_AM_PARANOID if you are paranoid */ #ifdef I_AM_PARANOID #define DONT_ALLOW_USER_CHANGE 1 diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index e748ba42edc..dac7ca661d1 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -11,9 +11,7 @@ #define PROTOCOL_VERSION @PROTOCOL_VERSION@ #define MYSQL_SERVER_VERSION "@VERSION@" #define MYSQL_BASE_VERSION "mysqld-@MYSQL_BASE_VERSION@" -#ifndef MYSQL_SERVER_SUFFIX -#define MYSQL_SERVER_SUFFIX "@MYSQL_SERVER_SUFFIX@" -#endif +#define MYSQL_SERVER_SUFFIX_DEF "@MYSQL_SERVER_SUFFIX@" #define FRM_VER @DOT_FRM_VERSION@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ #define MYSQL_PORT @MYSQL_TCP_PORT@ @@ -25,11 +23,7 @@ #endif /* _CUSTOMCONFIG_ */ #ifndef LICENSE -#ifdef MYSQL_COMMERICAL_LICENSE -#define LICENSE "Commerical" -#else -#define LICENSE "GPL" -#endif +#define LICENSE GPL #endif /* LICENSE */ #endif /* _mysql_version_h */ |