bk commit into 5.0 tree (anozdrin:1.2603)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.0 repository of anozdrin.  When anozdrin 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@stripped, 2008-03-28 23:39:47+03:00, anozdrin@stripped +3 -0
  Fix tree:
    1. Use 'dat' extension, because it is handled in Makefile.am;
    2. Fix typo: the bug id is 35469, not 35649.

  mysql-test/r/loaddata.result@stripped, 2008-03-28 23:39:47+03:00, anozdrin@stripped +4 -4
    Update result file.

  mysql-test/std_data/bug35469.dat@stripped, 2008-03-28 23:37:48+03:00, anozdrin@stripped +0 -0
    Rename: mysql-test/std_data/bug35649.data -> mysql-test/std_data/bug35469.dat

  mysql-test/t/loaddata.test@stripped, 2008-03-28 23:39:47+03:00, anozdrin@stripped +4 -4
    1. Use 'dat' extension, because it is handled in Makefile.am;
    2. Fix typo: the bug id is 35469, not 35649.

diff -Nrup a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
--- a/mysql-test/r/loaddata.result	2008-03-28 18:59:13 +03:00
+++ b/mysql-test/r/loaddata.result	2008-03-28 23:39:47 +03:00
@@ -268,7 +268,7 @@ CREATE VIEW v1 AS SELECT * FROM t1;
 CREATE VIEW v2 AS SELECT 1 + 2 AS c0, c1, c2 FROM t1;
 CREATE VIEW v3 AS SELECT 1 AS d1, 2 AS d2;
 
-LOAD DATA INFILE '../std_data_ln/bug35649.data' INTO TABLE v1
+LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v1
 FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
@@ -288,7 +288,7 @@ c1	c2
 
 DELETE FROM t1;
 
-LOAD DATA INFILE '../std_data_ln/bug35649.data' INTO TABLE v2
+LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2
 FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
@@ -308,14 +308,14 @@ c0	c1	c2
 
 DELETE FROM t1;
 
-LOAD DATA INFILE '../std_data_ln/bug35649.data' INTO TABLE v2
+LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2
 FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
   LINES TERMINATED BY '\n' (c0, c2);
 ERROR HY000: Invalid column reference (v2.c0) in LOAD DATA
 
-LOAD DATA INFILE '../std_data_ln/bug35649.data' INTO TABLE v3
+LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v3
 FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
diff -Nrup a/mysql-test/std_data/bug35469.dat b/mysql-test/std_data/bug35469.dat
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/std_data/bug35469.dat	2008-03-28 23:37:48 +03:00
@@ -0,0 +1,3 @@
+"1", "string1"
+"2", "string2"
+"3", "string3"
diff -Nrup a/mysql-test/std_data/bug35649.data b/mysql-test/std_data/bug35649.data
--- a/mysql-test/std_data/bug35649.data	2008-03-28 18:59:13 +03:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,3 +0,0 @@
-"1", "string1"
-"2", "string2"
-"3", "string3"
diff -Nrup a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test
--- a/mysql-test/t/loaddata.test	2008-03-28 18:59:13 +03:00
+++ b/mysql-test/t/loaddata.test	2008-03-28 23:39:47 +03:00
@@ -260,7 +260,7 @@ CREATE VIEW v2 AS SELECT 1 + 2 AS c0, c1
 CREATE VIEW v3 AS SELECT 1 AS d1, 2 AS d2;
 
 --echo
-LOAD DATA INFILE '../std_data_ln/bug35649.data' INTO TABLE v1
+LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v1
   FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
@@ -276,7 +276,7 @@ SELECT * FROM v1;
 DELETE FROM t1;
 
 --echo
-LOAD DATA INFILE '../std_data_ln/bug35649.data' INTO TABLE v2
+LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2
   FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
@@ -293,7 +293,7 @@ DELETE FROM t1;
 
 --echo
 --error ER_LOAD_DATA_INVALID_COLUMN
-LOAD DATA INFILE '../std_data_ln/bug35649.data' INTO TABLE v2
+LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v2
   FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'
@@ -301,7 +301,7 @@ LOAD DATA INFILE '../std_data_ln/bug3564
 
 --echo
 --error ER_NON_UPDATABLE_TABLE
-LOAD DATA INFILE '../std_data_ln/bug35649.data' INTO TABLE v3
+LOAD DATA INFILE '../std_data_ln/bug35469.dat' INTO TABLE v3
   FIELDS ESCAPED BY '\\'
   TERMINATED BY ','
   ENCLOSED BY '"'