bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:2953)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped73hsm7sc91

 2953 Magnus Blåudd	2009-07-15
      ndb test
       - remove any <CR> (from Windows <CR><LF>)that has been loaded
         from the temp file before showing the result

    modified:
      mysql-test/suite/ndb/t/show_attributes.inc
      mysql-test/suite/ndb/t/show_primary_keys.inc
      mysql-test/suite/ndb/t/show_varpart.inc
=== modified file 'mysql-test/suite/ndb/t/show_attributes.inc'
--- a/mysql-test/suite/ndb/t/show_attributes.inc	2009-07-13 19:11:32 +0000
+++ b/mysql-test/suite/ndb/t/show_attributes.inc	2009-07-15 20:47:18 +0000
@@ -14,7 +14,8 @@ eval LOAD DATA INFILE '$dump_file' INTO 
 --remove_file $dump_file
 
 # Query the temporary table
-SELECT a as 'Attributes:' FROM test.desc WHERE a LIKE BINARY "%ST=%";
+SELECT TRIM(TRAILING "\r" FROM a) as 'Attributes:' FROM test.desc
+  WHERE a LIKE BINARY "%ST=%";
 
 DROP TABLE test.desc;
 --enable_query_log

=== modified file 'mysql-test/suite/ndb/t/show_primary_keys.inc'
--- a/mysql-test/suite/ndb/t/show_primary_keys.inc	2009-07-13 19:11:32 +0000
+++ b/mysql-test/suite/ndb/t/show_primary_keys.inc	2009-07-15 20:47:18 +0000
@@ -14,7 +14,8 @@ eval LOAD DATA INFILE '$dump_file' INTO 
 --remove_file $dump_file
 
 # Query the temporary table
-SELECT a as 'Primary keys:' FROM test.desc WHERE a LIKE BINARY "%PRIMARY%";
+SELECT TRIM(TRAILING "\r" FROM a) as 'Primary keys:' FROM test.desc
+  WHERE a LIKE BINARY "%PRIMARY%";
 
 DROP TABLE test.desc;
 --enable_query_log

=== modified file 'mysql-test/suite/ndb/t/show_varpart.inc'
--- a/mysql-test/suite/ndb/t/show_varpart.inc	2009-07-13 13:22:46 +0000
+++ b/mysql-test/suite/ndb/t/show_varpart.inc	2009-07-15 20:47:18 +0000
@@ -14,7 +14,7 @@ eval LOAD DATA INFILE '$dump_file' INTO 
 --remove_file $dump_file
 
 # Query the temporary table
-let $value = `SELECT a FROM test.desc
+let $value = `SELECT TRIM(TRAILING "\r" FROM a) FROM test.desc
   WHERE a LIKE BINARY "ForceVarPart%"`;
 echo $value;
 

Attachment: [text/bzr-bundle] bzr/[e-mail]