bk commit into 4.1 tree (gshchepa:1.2672) BUG#29294

From: <gshchepa(at)mysql.com>
Date: Tue Jul 03 2007 - 12:45:22 EDT

Below is the list of changes that have just been committed into a local 4.1 repository of uchum. When uchum does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository.
For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@1.2672, 2007-07-03 21:45:20+05:00, gshchepa@gleb.loc +2 -0   loaddata.result, loaddata.test:
    Test case update for bug #29294.

  mysql-test/r/loaddata.result@1.19, 2007-07-03 21:44:26+05:00, gshchepa@gleb.loc +1 -10     Test case update for bug #29294.

  mysql-test/t/loaddata.test@1.12, 2007-07-03 21:38:21+05:00, gshchepa@gleb.loc +1 -2     Test case update for bug #29294.

diff -Nrup a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result

--- a/mysql-test/r/loaddata.result	2007-07-03 19:05:23 +05:00
+++ b/mysql-test/r/loaddata.result	2007-07-03 21:44:26 +05:00

@@ -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	rr
-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
diff -Nrup a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test

--- a/mysql-test/t/loaddata.test	2007-07-03 19:05:21 +05:00
+++ b/mysql-test/t/loaddata.test	2007-07-03 21:38:21 +05:00

@@ -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

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com

Received on Tue Jul 3 12:42:25 2007