From 2108f31c4c67c3dbbc4909ff15afadd905e5d13e Mon Sep 17 00:00:00 2001 From: llsth Date: Wed, 25 May 2016 22:17:38 +0200 Subject: [PATCH] Fixed MySql to version 6.9.8 --- MySql/.githooks/check_copyright.py | 32 ---- MySql/.githooks/license_check.py | 82 -------- MySql/.githooks/pre-commit | 29 --- .../CollectionFiles/FixRegTables.exe | Bin .../MSHelp2_RegTables__RTL_---_---.msm | Bin 0 -> 29184 bytes MySql/Documentation/images.proj | 178 ++++++++++++++++++ MySql/README | 38 +--- MySql/Source/MySql.Data/MySql.Data.csproj | 107 +++++++---- .../MySql.Data/Properties/AssemblyInfo.cs | 6 +- .../MySql.Web.Tests/SessionLockingBuild.bat | 2 + 10 files changed, 253 insertions(+), 221 deletions(-) delete mode 100644 MySql/.githooks/check_copyright.py delete mode 100644 MySql/.githooks/license_check.py delete mode 100644 MySql/.githooks/pre-commit mode change 100755 => 100644 MySql/Documentation/CollectionFiles/FixRegTables.exe create mode 100644 MySql/Documentation/CollectionFiles/MSHelp2_RegTables__RTL_---_---.msm create mode 100644 MySql/Documentation/images.proj create mode 100644 MySql/Tests/MySql.Web.Tests/SessionLockingBuild.bat diff --git a/MySql/.githooks/check_copyright.py b/MySql/.githooks/check_copyright.py deleted file mode 100644 index ec76e039..00000000 --- a/MySql/.githooks/check_copyright.py +++ /dev/null @@ -1,32 +0,0 @@ -#!c:\python27\python.exe - -import re -import sys -import os -from datetime import date - -year = str(date.today().year) -error = False - -#files = os.popen("git diff --name-only --diff-filter=ACMRTUXB").read().splitlines(True) -files = os.popen("git status -uno --porcelain").read().splitlines(True) -for file in files: - status = file[0:2].strip() - if status == 'R': - continue - filename = file[2:].strip() - - with open(filename) as f: - file_content = f.readlines() - - for line in file_content: - if line.find("Copyright") == -1: - continue - if line.find(year) == -1: - print filename + ' does not have an updated copyright date' - error = True - -if error: - sys.exit(1) - -sys.exit(0) diff --git a/MySql/.githooks/license_check.py b/MySql/.githooks/license_check.py deleted file mode 100644 index 3b082483..00000000 --- a/MySql/.githooks/license_check.py +++ /dev/null @@ -1,82 +0,0 @@ -#!c:\python27\python.exe - -import re -import sys -import os - -validext = { '.cs', '.c', '.cpp', '.h' } -skipdir = { '.git', '.bzr', 'zlib', 'obj', 'bin', 'MySql.EMTrace', 'Samples' } -skipfile = { '.Designer.cs' } -num_to_skip = 2 -error = False - -def process_file(file, banner): - global error - with open(file) as f: - file_content = f.readlines() - - if len(file_content) < len(banner): - print file + " is not large enough" - return; - - # remove the # of lines the user told us to skip - for x in range(0, num_to_skip): - file_content.pop(0) - - for line in range(0, len(banner)): - if not banner[line].strip() == file_content[line].strip(): - print filename + ' does not match' - error = True - return - -def should_skip_dir(dir): - lower_dir = dir.lower() - for dir_to_skip in skipdir: - if lower_dir.find(dir_to_skip.lower()) > -1: - return True - return False - -def should_skip_file(file): - lower_file = file.lower() - for file_to_skip in skipfile: - if file_to_skip.lower() in lower_file: - return True - for ext in validext: - if file.endswith(ext): - return False - return True - - -############################################################ -# main prog -############################################################ -if len(sys.argv) < 2: - print "Not enough arguments" - sys.exit(1) -license_file = sys.argv[1] -if not os.path.isfile(license_file): - print "License file does not exist" - sys.exit(1) - -if len(sys.argv) == 3: - num_to_skip = int(sys.argv[2]) - -with open(sys.argv[1]) as f: - banner_content = f.readlines() - -for root, dirs, files in os.walk('.'): - if should_skip_dir(root): - continue - for file in files: - if should_skip_file(file): - continue; - filename = os.path.join(root, file) - process_file(filename, banner_content) - -if error: - sys.exit(1) - -sys.exit(0) - - - diff --git a/MySql/.githooks/pre-commit b/MySql/.githooks/pre-commit deleted file mode 100644 index abbcfca5..00000000 --- a/MySql/.githooks/pre-commit +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". -#import sys -#import subprocess - -#subprocess.Popen("../../check_copyright.py", shell=True) -ERROR=0 -if ! (.githooks/license_check.py Installer/gpl-banner.txt) -then - ERROR=1 - echo '********** license_check error **********' -fi -if ! (.githooks/check_copyright.py) -then - ERROR=1 - echo '********** check_copyright error **********' -fi -if [ $ERROR = 1 ] -then - echo '********** ERROR **********' - exit 1 -fi -exit 0 diff --git a/MySql/Documentation/CollectionFiles/FixRegTables.exe b/MySql/Documentation/CollectionFiles/FixRegTables.exe old mode 100755 new mode 100644 diff --git a/MySql/Documentation/CollectionFiles/MSHelp2_RegTables__RTL_---_---.msm b/MySql/Documentation/CollectionFiles/MSHelp2_RegTables__RTL_---_---.msm new file mode 100644 index 0000000000000000000000000000000000000000..29f4f8a94aa26f91222e6e010b39db8471a4eed3 GIT binary patch literal 29184 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 E2dvDAWdHyG literal 0 HcmV?d00001 diff --git a/MySql/Documentation/images.proj b/MySql/Documentation/images.proj new file mode 100644 index 00000000..f9f88bc5 --- /dev/null +++ b/MySql/Documentation/images.proj @@ -0,0 +1,178 @@ + + + + connector-net-visual-studio-add-connection + + + connector-net-visual-studio-choose-data-source + + + connector-net-visual-studio-add-connection-dialog + + + connector-net-visual-studio-new-data-connection + + + connector-net-visual-studio-editing-new-table + + + connector-net-visual-studio-choose-table-name + + + connector-net-visual-studio-newly-created-table + + + connector-net-visual-studio-table-desginer-menu-item + + + connector-net-visual-studio-indexes-dialog + + + connector-net-visual-studio-foreign-key-relationships + + + connector-net-visual-studio-table-properties-menu + + + connector-net-visual-studio-selecting-table-properties + + + connector-net-visual-studio-views-edit-sql + + + connector-net-visual-studio-views-sql-added + + + connector-net-visual-studio-views-sql-saved + + + connector-net-visual-studio-stored-procedure-edit + + + connector-net-visual-studio-stored-procedure-saved + + + connector-net-website-config-tool + + + connector-net-website-config-tool-membership + + + connector-net-website-config-tool-string-editor + + + connector-net-website-config-tool-options + + + connector-net-website-config-tool-roles + + + connector-net-website-config-tool-profiles + + + connector-net-website-config-tool-session-state + + + connector-net-website-config-tool-tables + + + connector-net-sql-editor-new-file-dialog + + + connector-net-sql-editor-query + + + connector-net-ddl-t4-ef-properties + + + connector-net-ddl-t4-ef-generate + + + connector-net-tutorials-1 + + + connector-net-tutorials-authentication-type + + + connector-net-tutorials-select-provider + + + connector-net-tutorials-tables + + + connector-net-tutorials-security-tab + + + connector-net-tutorials-create-user + + + connector-net-tutorials-users-roles-tables + + + connector-net-tutorials-asp-provider-profile-simple-app + + + connector-net-visual-studio-entity-framework-add-entity-data-model + + + connector-net-visual-studio-entity-framework-entity-data-model-wizard-1 + + + connector-net-visual-studio-entity-framework-entity-data-model-wizard-2 + + + connector-net-visual-studio-entity-framework-entity-data-model-wizard-3 + + + connector-net-visual-studio-entity-framework-entity-data-model-diagram + + + connector-net-visual-studio-entity-framework-data-source-configuration-wizard-1 + + + connector-net-visual-studio-entity-framework-data-source-configuration-wizard-2 + + + connector-net-visual-studio-entity-framework-data-source-configuration-wizard-3 + + + connector-net-visual-studio-entity-framework-data-sources + + + connector-net-visual-studio-entity-framework-data-form-design + + + connector-net-visual-studio-entity-framework-form-add-code + + + connector-net-visual-studio-entity-framework-app-running-1 + + + connector-net-visual-studio-entity-framework-save-enabled + + + connector-net-visual-studio-entity-framework-form-add-code-save + + + connector-net-visual-studio-entity-framework-tutorial-linq-1 + + + connector-net-visual-studio-entity-framework-tutorial-linq-2 + + + connector-net-visual-studio-entity-framework-tutorial-linq-3 + + + connector-net-visual-studio-entity-framework-tutorial-linq-4 + + + connector-net-visual-studio-entity-framework-tutorial-linq-5 + + + connector-net-visual-studio-entity-framework-tutorial-linq-6 + + + connector-net-visual-studio-entity-framework-tutorial-linq-7 + + + \ No newline at end of file diff --git a/MySql/README b/MySql/README index 8fc1cfce..c85d6106 100644 --- a/MySql/README +++ b/MySql/README @@ -1,4 +1,4 @@ -MySQL Connector/Net 6.x +MySQL Connector/Net 6.9 This is a release of MySQL Connector/Net, Oracle's dual- license ADO.Net Driver for MySQL. For the avoidance of @@ -8,38 +8,4 @@ MySQL Connector/Net is brought to you by Oracle. Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved. -License information can be found in the COPYING file. - -MySQL FOSS License Exception -We want free and open source software applications under -certain licenses to be able to use the GPL-licensed MySQL -Connector/NET (specified GPL-licensed MySQL client libraries) -despite the fact that not all such FOSS licenses are -compatible with version 2 of the GNU General Public License. -Therefore there are special exceptions to the terms and -conditions of the GPLv2 as applied to these client libraries, -which are identified and described in more detail in the -FOSS License Exception at - - -This distribution may include materials developed by third -parties. For license and attribution notices for these -materials, please refer to the documentation that accompanies -this distribution (see the "Licenses for Third-Party Components" -appendix) or view the online documentation at - - -The accompanying documentation currently exists in MSDN help -format and is located in the 'doc' directory. - -GPLv2 Disclaimer -For the avoidance of doubt, except that if any license choice -other than GPL or LGPL is available it will apply instead, -Oracle elects to use only the General Public License version 2 -(GPLv2) at this time for any software where a choice of GPL -license versions is made available with the language indicating -that GPLv2 or any later version may be used, or where a choice -of which version of the GPL is applied is otherwise unspecified. - -This software is OSI Certified Open Source Software. -OSI Certified is a certification mark of the Open Source Initiative. +License information can be found in the COPYING file. \ No newline at end of file diff --git a/MySql/Source/MySql.Data/MySql.Data.csproj b/MySql/Source/MySql.Data/MySql.Data.csproj index 10047f39..785f5dbd 100644 --- a/MySql/Source/MySql.Data/MySql.Data.csproj +++ b/MySql/Source/MySql.Data/MySql.Data.csproj @@ -2,13 +2,63 @@ Debug - AnyCPU - 8.0.30703 - 2.0 - 4.0 - NET_40_OR_GREATER - 0.6.1 + AnyCPU + + + + + + + AnyCPU + + + + + + + 9.0.30729 + 2.0 + 4.5.1 + v4.5.1 + NET_40_OR_GREATER;NET_45_OR_GREATER;NET_451_OR_GREATER; + + + + + 9.0.30729 + 2.0 + 4.5 + v4.5 + NET_40_OR_GREATER;NET_45_OR_GREATER + + + + + 9.0.30729 + 2.0 + 4.0 + v4.0 + NET_40_OR_GREATER + + + + + + 9.0.30729 + 2.0 + 3.5 + v3.5 + + + {E9DF5ED1-4CBD-4226-B931-9A51610AC14D} Library @@ -31,50 +81,36 @@ false false true + true full false - - - obj\ - obj\ - ..\..\..\bin + $(TargetFrameworkVersion)\ + obj\$(TargetFrameworkVersion)\ + obj\$(TargetFrameworkVersion)\ + bin\$(TargetFrameworkVersion)\Debug\ $(DefineConstants);DEBUG;TRACE prompt 4 AllRules.ruleset true false - v4.0 + pdbonly true - - - obj\ - obj\ - ..\..\..\bin + $(TargetFrameworkVersion)\ + obj\$(TargetFrameworkVersion)\ + obj\$(TargetFrameworkVersion)\ + bin\$(TargetFrameworkVersion)\Release\ $(DefineConstants);TRACE prompt 4 AllRules.ruleset + bin\Release\MySql.Data.XML false - v4.0 - - - true - - - obj\ - obj\ - ..\..\..\bin - $(DefineConstants);TRACE - prompt - 1 - false - v4.0 @@ -267,11 +303,4 @@ - - false - ..\..\..\bin - $(DefineConstants);DEBUG;TRACE - 4 - true - - + \ No newline at end of file diff --git a/MySql/Source/MySql.Data/Properties/AssemblyInfo.cs b/MySql/Source/MySql.Data/Properties/AssemblyInfo.cs index ccc1fae1..3743fda8 100644 --- a/MySql/Source/MySql.Data/Properties/AssemblyInfo.cs +++ b/MySql/Source/MySql.Data/Properties/AssemblyInfo.cs @@ -79,10 +79,10 @@ using System.Security; // documentation for more information on this. // #if DEBUG -//[assembly: AssemblyDelaySign(true)] -//[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")] +[assembly: AssemblyDelaySign(true)] +[assembly: AssemblyKeyFileAttribute(@"..\..\ConnectorNetPublicKey.snk")] #endif -//[assembly: AssemblyKeyName("ConnectorNet")] +[assembly: AssemblyKeyName("ConnectorNet")] [assembly: InternalsVisibleTo("MySql.Data.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d973bda91f71752c78294126974a41a08643168271f65fc0fb3cd45f658da01fbca75ac74067d18e7afbf1467d7a519ce0248b13719717281bb4ddd4ecd71a580dfe0912dfc3690b1d24c7e1975bf7eed90e4ab14e10501eedf763bff8ac204f955c9c15c2cf4ebf6563d8320b6ea8d1ea3807623141f4b81ae30a6c886b3ee1")] [assembly: InternalsVisibleTo("MySql.Data.CF.Tests, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d973bda91f71752c78294126974a41a08643168271f65fc0fb3cd45f658da01fbca75ac74067d18e7afbf1467d7a519ce0248b13719717281bb4ddd4ecd71a580dfe0912dfc3690b1d24c7e1975bf7eed90e4ab14e10501eedf763bff8ac204f955c9c15c2cf4ebf6563d8320b6ea8d1ea3807623141f4b81ae30a6c886b3ee1")] [assembly: InternalsVisibleTo("MySql.Data.Entity, PublicKey = 0024000004800000940000000602000000240000525341310004000001000100d973bda91f71752c78294126974a41a08643168271f65fc0fb3cd45f658da01fbca75ac74067d18e7afbf1467d7a519ce0248b13719717281bb4ddd4ecd71a580dfe0912dfc3690b1d24c7e1975bf7eed90e4ab14e10501eedf763bff8ac204f955c9c15c2cf4ebf6563d8320b6ea8d1ea3807623141f4b81ae30a6c886b3ee1")] diff --git a/MySql/Tests/MySql.Web.Tests/SessionLockingBuild.bat b/MySql/Tests/MySql.Web.Tests/SessionLockingBuild.bat new file mode 100644 index 00000000..46683976 --- /dev/null +++ b/MySql/Tests/MySql.Web.Tests/SessionLockingBuild.bat @@ -0,0 +1,2 @@ + +xcopy /i /y %1\*.* %2 \ No newline at end of file