diff options
| author | unknown <tsmith@sita.local> | 2007-09-24 11:37:26 +0200 |
|---|---|---|
| committer | unknown <tsmith@sita.local> | 2007-09-24 11:37:26 +0200 |
| commit | 07f1b717e0e8a7a549464a4b70d3e9977db62d37 (patch) | |
| tree | e3bfb5319aa2d04b05a1665481fbf5b3b7181296 /include | |
| parent | bd8e7fee1f260b6f5b9b39c67bb6e701eace3cae (diff) | |
| parent | 37d6773a302e9babafc2aba38148daf750e06091 (diff) | |
| download | mariadb-git-07f1b717e0e8a7a549464a4b70d3e9977db62d37.tar.gz | |
Merge sita.local:/Users/tsmith/m/bk/51
into sita.local:/Users/tsmith/m/bk/maint/51
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_version.h.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index dac7ca661d1..04a43f2c968 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -15,6 +15,7 @@ #define FRM_VER @DOT_FRM_VERSION@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ #define MYSQL_PORT @MYSQL_TCP_PORT@ +#define MYSQL_PORT_DEFAULT @MYSQL_TCP_PORT_DEFAULT@ #define MYSQL_UNIX_ADDR "@MYSQL_UNIX_ADDR@" #define MYSQL_CONFIG_NAME "my" #define MYSQL_COMPILATION_COMMENT "@COMPILATION_COMMENT@" |