bzr commit into connector-net-6.2 branch (reggie.burnett:851)

[Reggie Burnett]

#At file:///C:/work/connector-net/6.2/ based on revid:reggie.burnett@stripped622mmwtengm902c

  851 Reggie Burnett	2010-04-27 [merge]
      merged

    modified:
      Documentation/help.shfbproj
      MySql.Data/Provider/Properties/AssemblyInfo.cs
      MySql.Data/Provider/Source/ISSchemaProvider.cs
      MySql.Data/Provider/Source/MySqlPacket.cs
      MySql.Data/Provider/Source/common/MySqlTokenizer.cs
=== modified file 'Documentation/help.shfbproj'
=== modified file 'Documentation/help.shfbproj'
--- a/Documentation/help.shfbproj	2009-12-15 21:58:48 +0000
+++ b/Documentation/help.shfbproj	2010-04-27 18:30:06 +0000
@@ -7,7 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5c97df05-1229-4b30-9711-789d0d6ff81b}</ProjectGuid>
-    <SHFBSchemaVersion>1.8.0.0</SHFBSchemaVersion>
+    <SHFBSchemaVersion>1.8.0.3</SHFBSchemaVersion>
     <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
          Studio adds them anyway -->
     <AssemblyName>Documentation</AssemblyName>
@@ -37,13 +37,13 @@
     <CleanIntermediates>False</CleanIntermediates>
     <BuildLogFile>
     </BuildLogFile>
-    <HelpFileFormat>Help1xAndHelp2x</HelpFileFormat>
+    <HelpFileFormat>HtmlHelp1, MSHelp2</HelpFileFormat>
     <FrameworkVersion>2.0.50727</FrameworkVersion>
     <RootNamespaceContainer>True</RootNamespaceContainer>
     <RootNamespaceTitle>Reference</RootNamespaceTitle>
     <HelpTitle>MySQL Connector/Net</HelpTitle>
     <CopyrightHref>http://www.mysql.com</CopyrightHref>
-    <CopyrightText>&amp;#169%3b 2004-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc. All rights reserved.</CopyrightText>
+    <CopyrightText>Copyright &amp;#169%3b 2004,2010, Oracle and/or its affiliates.  All rights reserved.</CopyrightText>
     <FeedbackEMailAddress>support%40mysql.com</FeedbackEMailAddress>
     <PresentationStyle>vs2005</PresentationStyle>
     <NamingMethod>MemberName</NamingMethod>

=== modified file 'MySql.Data/Provider/Properties/AssemblyInfo.cs'
--- a/MySql.Data/Provider/Properties/AssemblyInfo.cs	2010-02-03 14:54:59 +0000
+++ b/MySql.Data/Provider/Properties/AssemblyInfo.cs	2010-04-27 18:30:06 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2007 MySQL AB
+// Copyright ⌐ 2004,2010, Oracle and/or its affiliates.  All rights reserved.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as published by

=== modified file 'MySql.Data/Provider/Source/ISSchemaProvider.cs'
--- a/MySql.Data/Provider/Source/ISSchemaProvider.cs	2010-04-21 17:38:12 +0000
+++ b/MySql.Data/Provider/Source/ISSchemaProvider.cs	2010-04-27 18:30:06 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+// Copyright ⌐ 2004,2010, Oracle and/or its affiliates.  All rights reserved.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as published by

=== modified file 'MySql.Data/Provider/Source/MySqlPacket.cs'
--- a/MySql.Data/Provider/Source/MySqlPacket.cs	2010-04-21 15:23:10 +0000
+++ b/MySql.Data/Provider/Source/MySqlPacket.cs	2010-04-27 18:30:06 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+// Copyright © 2004,2010, Oracle and/or its affiliates.  All rights reserved.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as published by

=== modified file 'MySql.Data/Provider/Source/common/MySqlTokenizer.cs'
--- a/MySql.Data/Provider/Source/common/MySqlTokenizer.cs	2010-04-10 01:39:23 +0000
+++ b/MySql.Data/Provider/Source/common/MySqlTokenizer.cs	2010-04-27 18:30:06 +0000
@@ -1,4 +1,4 @@
-// Copyright (c) 2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+// Copyright ⌐ 2004,2010, Oracle and/or its affiliates.  All rights reserved.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as published by

Attachment: [text/bzr-bundle]