From 05c9acaaf76c83a1ebfb9e4ab66b132377357282 Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Thu, 18 Nov 2010 18:02:37 +0200 Subject: Bug #50021: Windows standard configuration files are showing Linux options/settings 1. Changed the default value for socket on Windows to the windows default 2. Removed hard-coded trailing slashes from innodb_data_home_dir and innodb_log_group_name_dir. 3. Added extra backslashes to the innodb directory example 4. Made the tempdir platform "dependent" 5. Fixed the comments in the .ini files 6. Removed the tmpdir from the templates and the scripts --- win/configure.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'win') diff --git a/win/configure.js b/win/configure.js index 38fa8e7afeb..ebed98e2391 100644 --- a/win/configure.js +++ b/win/configure.js @@ -101,8 +101,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 \"" + -- cgit v1.2.1 From 85323eda8a5823e4db1fa34dc998684b67e710b5 Mon Sep 17 00:00:00 2001 From: Kent Boortz Date: Tue, 28 Dec 2010 19:57:23 +0100 Subject: - Added/updated copyright headers - Removed files specific to compiling on OS/2 - Removed files specific to SCO Unix packaging - Removed "libmysqld/copyright", text is included in documentation - Removed LaTeX headers for NDB Doxygen documentation - Removed obsolete NDB files - Removed "mkisofs" binaries - Removed the "cvs2cl.pl" script - Changed a few GPL texts to use "program" instead of "library" --- win/create_manifest.js | 15 +++++++++++++++ win/mysql_manifest.cmake | 14 ++++++++++++++ 2 files changed, 29 insertions(+) (limited to 'win') diff --git a/win/create_manifest.js b/win/create_manifest.js index dbdd83588c5..d7b790fd0f8 100755 --- a/win/create_manifest.js +++ b/win/create_manifest.js @@ -1,3 +1,18 @@ +/* Copyright (C) 2007, 2008 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + /* manifest.js - Writes a custom XML manifest for each executable/library 5 command line options must be supplied: diff --git a/win/mysql_manifest.cmake b/win/mysql_manifest.cmake index 0d429e438d6..a824457b5a7 100755 --- a/win/mysql_manifest.cmake +++ b/win/mysql_manifest.cmake @@ -1,3 +1,17 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # - MYSQL_EMBED_MANIFEST(target_name required_privs) # Create a manifest for target_name. Set the execution level to require_privs -- cgit v1.2.1