diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-10 09:39:14 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-10 09:39:14 +0100 |
| commit | 41d432462b905207b9a1cf51d2fcc88a7b09dd35 (patch) | |
| tree | c046292241c90cdf078c49c93539a78e80094ea0 /win | |
| parent | d4a3a7b90ef06cb3eaf68317c42020e2980d3777 (diff) | |
| parent | ce675406ca8dbc1532a908803a1371de8432d466 (diff) | |
| download | mariadb-git-41d432462b905207b9a1cf51d2fcc88a7b09dd35.tar.gz | |
merge 5.2
Diffstat (limited to 'win')
| -rw-r--r-- | win/configure-mariadb.bat | 2 | ||||
| -rw-r--r-- | win/configure.js | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/win/configure-mariadb.bat b/win/configure-mariadb.bat index 834d73732b8..6c4283359b4 100644 --- a/win/configure-mariadb.bat +++ b/win/configure-mariadb.bat @@ -3,6 +3,6 @@ cscript win\configure.js ^ WITH_FEDERATEDX_STORAGE_ENGINE ^ WITH_MERGE_STORAGE_ENGINE ^ WITH_PARTITION_STORAGE_ENGINE ^ - WITH_MARIA_STORAGE_ENGINE ^ + WITH_ARIA_STORAGE_ENGINE ^ WITH_PBXT_STORAGE_ENGINE ^ WITH_XTRADB_STORAGE_ENGINE diff --git a/win/configure.js b/win/configure.js index d59a12b1a57..da7e4c2cd43 100644 --- a/win/configure.js +++ b/win/configure.js @@ -116,8 +116,7 @@ try GetValue(configureIn, "DOT_FRM_VERSION") + "\")"); configfile.WriteLine("SET (MYSQL_TCP_PORT_DEFAULT \"" + default_port + "\")"); configfile.WriteLine("SET (MYSQL_TCP_PORT \"" + actual_port + "\")"); - configfile.WriteLine("SET (MYSQL_UNIX_ADDR \"" + - GetValue(configureIn, "MYSQL_UNIX_ADDR_DEFAULT") + "\")"); + configfile.WriteLine("SET (MYSQL_UNIX_ADDR \"MySQL\")"); var version = GetVersion(configureIn); configfile.WriteLine("SET (VERSION \"" + version + "\")"); configfile.WriteLine("SET (MYSQL_BASE_VERSION \"" + |