--- C:\Documents and Settings\mpetteys\Desktop\mysqlclient.1.0.6\command.cs	Fri Aug 19 15:47:52 2005
+++ C:\Program Files\mysql\MySQL Connector Net 1.0.6\src\MySqlClient\command.cs	Wed Oct 12 23:57:17 2005
@@ -67,8 +67,6 @@
 		public MySqlCommand(string cmdText, MySqlConnection connection) : this(cmdText)
 		{
 			Connection = connection;
-			if (connection != null)
-				parameters.ParameterMarker = connection.ParameterMarker;
 		}
 
 		/// <include file='docs/mysqlcommand.xml' path='docs/ctor4/*'/>
@@ -145,8 +143,7 @@
 					this.Transaction = null;
 
 				connection = (MySqlConnection)value;
-				if (connection != null)
-					parameters.ParameterMarker = connection.ParameterMarker;
+				parameters.Connection = connection;
 			}
 		}
 
@@ -555,12 +552,12 @@
 
 			foreach (string token in tokens)
 			{
-				if ( token[0] != parameters.ParameterMarker )
+				if ( token[0] != this.Connection.ParameterMarker )
 					newSQL.Append( token );
 				else
 				{
 					parameterMap.Add( token );
-					newSQL.Append( parameters.ParameterMarker );
+					newSQL.Append( this.Connection.ParameterMarker );
 				}
 			}
 
@@ -601,12 +598,12 @@
 					delim=c;
 				else if (c == '\\') 
 					escaped = ! escaped;
-				else if (c == parameters.ParameterMarker && delim == Char.MinValue && ! escaped) 
+				else if (c == this.Connection.ParameterMarker && delim == Char.MinValue && ! escaped) 
 				{
 					tokens.Add( sqlPart.ToString() );
 					sqlPart.Remove( 0, sqlPart.Length ); 
 				}
-				else if (sqlPart.Length > 0 && sqlPart[0] == parameters.ParameterMarker && 
+				else if (sqlPart.Length > 0 && sqlPart[0] == this.Connection.ParameterMarker && 
 					! Char.IsLetterOrDigit(c) && c != '_' && c != '.' && c != '$')
 				{
 					tokens.Add( sqlPart.ToString() );