Merge bk-internal.mysql.com:/home/bk/mysql-4.0

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0

mysys/default.c

@@ -387,6 +387,8 @@ static int search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
       *ptr++= '=';
       for ( ; value != value_end; value++)
       {
+	if (*value == '\"' || *value == '\'')
+	  continue;
 	if (*value == '\\' && value != value_end-1)
 	{
 	  switch(*++value) {
@@ -405,6 +407,12 @@ static int search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
 	  case 's':
 	    *ptr++= ' ';			/* space */
 	    break;
+	  case '\"':
+	    *ptr++= '\"';
+	    break;
+	  case '\'':
+	    *ptr++= '\'';
+	    break;
 	  case '\\':
 	    *ptr++= '\\';
 	    break;