Connector/NET commit: r1268 - in branches/5.2: . MySql.Data/Provider/Source MySql.Data/Provider/Source/docs

[rburnett]

Modified:
   branches/5.2/CHANGES
   branches/5.2/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs
   branches/5.2/MySql.Data/Provider/Source/NativeDriver.cs
   branches/5.2/MySql.Data/Provider/Source/docs/MySqlConnection.xml
Log:
Implemented interactive session option (WL #4386)

Modified: branches/5.2/CHANGES
===================================================================
--- branches/5.2/CHANGES	2008-04-30 17:34:10 UTC (rev 1267)
+++ branches/5.2/CHANGES	2008-05-01 17:48:09 UTC (rev 1268)
@@ -17,7 +17,8 @@
 - Fixed bug where retrieving passwords that are encrypted was not returning proper
   passwords (bug #35336)    
 - Fixed problem with profile provider where properties that were specified without
-  a given type could not be retrieved properly (bug #36000)    
+  a given type could not be retrieved properly (bug #36000)  
+- Implemented interactive session connection string option  
     
 Version 5.2.1 - 2/27/2008
 - Tons of fixes in providers.  The actually work now.  :)

Modified: branches/5.2/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs	2008-04-30 17:34:10 UTC (rev 1267)
+++ branches/5.2/MySql.Data/Provider/Source/MySqlConnectionStringBuilder.cs	2008-05-01 17:48:09 UTC (rev 1268)
@@ -53,6 +53,7 @@
         bool treatTinyAsBoolean;
         bool allowUserVariables;
         bool clearing;
+        bool interactiveSession;
 
         static MySqlConnectionStringBuilder()
         {
@@ -93,6 +94,7 @@
             defaultValues.Add(Keyword.DefaultCommandTimeout, 30);
             defaultValues.Add(Keyword.TreatTinyAsBoolean, true);
             defaultValues.Add(Keyword.AllowUserVariables, false);
+            defaultValues.Add(Keyword.InteractiveSession, false);
         }
 
         /// <summary>
@@ -685,6 +687,22 @@
             }
         }
 
+#if !CF && !MONO
+        [Category("Advanced")]
+        [DisplayName("Interactive Session")]
+        [Description("Should this session be considered interactive?")]
+        [DefaultValue(false)]
+        [RefreshProperties(RefreshProperties.All)]
+#endif
+        public bool InteractiveSession
+        {
+            get { return interactiveSession; }
+            set
+            {
+                SetValue("Interactive Session", value);
+                interactiveSession = value;
+            }
+        }
         #endregion
 
         #region Pooling Properties
@@ -1114,6 +1132,9 @@
                     return Keyword.TreatTinyAsBoolean;
                 case "allow user variables":
                     return Keyword.AllowUserVariables;
+                case "interactive":
+                case "interactive session":
+                    return Keyword.InteractiveSession;
             }
             throw new ArgumentException(Resources.KeywordNotSupported, key);
         }
@@ -1196,6 +1217,8 @@
                     return treatTinyAsBoolean;
                 case Keyword.AllowUserVariables:
                     return allowUserVariables;
+                case Keyword.InteractiveSession:
+                    return interactiveSession;
                 default:
                     return null; /* this will never happen */
             }
@@ -1293,6 +1316,8 @@
                     treatTinyAsBoolean = ConvertToBool(value); break;
                 case Keyword.AllowUserVariables:
                     allowUserVariables = ConvertToBool(value); break;
+                case Keyword.InteractiveSession:
+                    interactiveSession = ConvertToBool(value); break;
             }
         }
 
@@ -1472,6 +1497,7 @@
         BlobAsUTF8ExcludePattern,
         DefaultCommandTimeout,
         TreatTinyAsBoolean,
-        AllowUserVariables
+        AllowUserVariables,
+        InteractiveSession
     }
 }

Modified: branches/5.2/MySql.Data/Provider/Source/NativeDriver.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/NativeDriver.cs	2008-04-30 17:34:10 UTC (rev 1267)
+++ branches/5.2/MySql.Data/Provider/Source/NativeDriver.cs	2008-05-01 17:48:09 UTC (rev 1268)
@@ -366,6 +366,10 @@
             // allow load data local infile
             flags |= ClientFlags.LOCAL_FILES;
 
+            // did the user request an interactive session?
+            if (Settings.InteractiveSession)
+                flags |= ClientFlags.INTERACTIVE;
+
             // if the server allows it and a database was specified, then indicate
             // that we will connect with a database name
             if ((serverCaps & ClientFlags.CONNECT_WITH_DB) != 0 &&

Modified: branches/5.2/MySql.Data/Provider/Source/docs/MySqlConnection.xml
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/docs/MySqlConnection.xml	2008-04-30 17:34:10 UTC (rev 1267)
+++ branches/5.2/MySql.Data/Provider/Source/docs/MySqlConnection.xml	2008-05-01 17:48:09 UTC (rev 1268)
@@ -1086,6 +1086,13 @@
               Should the provider expect user variables in the SQL.
             </td>
           </tr>
+          <tr>
+            <td>Interactive -or- Interactive Session</td>
+            <td>false</td>
+            <td>
+              Should this session be considered interactive?
+            </td>
+          </tr>
         </table>
       </div>
       <para>