Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-4.1-opt

into  gleb.loc:/home/uchum/work/bk/4.1-opt

mysql-test/r/loaddata.result

@@ -97,8 +97,7 @@ INSERT INTO t1 (c1) VALUES
 ('r'),   ('rr'),   ('rrr'),   ('rrrr'),
 ('.r'),  ('.rr'),  ('.rrr'),  ('.rrrr'),
 ('r.'),  ('rr.'),  ('rrr.'),  ('rrrr.'),
-('.r.'), ('.rr.'), ('.rrr.'), ('.rrrr.'),
-('\r'),  ('\\rr'), ('\\\rr'), ('\\\\rr');
+('.r.'), ('.rr.'), ('.rrr.'), ('.rrrr.');
 SELECT * FROM t1;
 id	c1
 1	r
@@ -117,10 +116,6 @@ id	c1
 14	.rr.
 15	.rrr.
 16	.rrrr.
-17	
-18	\rr
-19	\
r
-20	\\rr
 SELECT * INTO OUTFILE 'MYSQL_TEST_DIR/var/tmp/t1' FIELDS ENCLOSED BY 'r' FROM t1;
 r1r	rrrr
 r2r	rrrrrr
@@ -138,10 +133,6 @@ r13r	r.rr.r
 r14r	r.rrrr.r
 r15r	r.rrrrrr.r
 r16r	r.rrrrrrrr.r
-r17r	r
r
-r18r	r\\rrrrr
-r19r	r\\
rrr
-r20r	r\\\\rrrrr
 LOAD DATA INFILE 'MYSQL_TEST_DIR/var/tmp/t1' INTO TABLE t2 FIELDS ENCLOSED BY 'r';
 SELECT t1.id, c1, c2 FROM t1 LEFT  JOIN t2 ON t1.id=t2.id WHERE c1 != c2;
 id	c1	c2

mysql-test/t/loaddata.test

@@ -86,8 +86,7 @@ INSERT INTO t1 (c1) VALUES
   ('r'),   ('rr'),   ('rrr'),   ('rrrr'),
   ('.r'),  ('.rr'),  ('.rrr'),  ('.rrrr'),
   ('r.'),  ('rr.'),  ('rrr.'),  ('rrrr.'),
-  ('.r.'), ('.rr.'), ('.rrr.'), ('.rrrr.'),
-  ('\r'),  ('\\rr'), ('\\\rr'), ('\\\\rr');
+  ('.r.'), ('.rr.'), ('.rrr.'), ('.rrrr.');
 SELECT * FROM t1;
 
 --exec rm -f $MYSQL_TEST_DIR/var/tmp/t1