bk commit into 5.1 tree (petr:1.2177)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps 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.2177 06/06/05 03:50:32 petr@stripped +1 -0
  fix test failure in the team tree

  storage/csv/ha_tina.cc
    1.51 06/06/05 03:50:29 petr@stripped +12 -15
    fix windows csv test failure

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	petr
# Host:	outpost.site
# Root:	/home/cps/mysql/devel/5.1-csv-remove-mmap

--- 1.50/storage/csv/ha_tina.cc	2006-05-31 10:50:31 +04:00
+++ 1.51/storage/csv/ha_tina.cc	2006-06-05 03:50:29 +04:00
@@ -503,28 +503,25 @@
 off_t find_eoln_buff(Transparent_file *data_buff, off_t begin,
                      off_t end, int *eoln_len)
 {
+  *eoln_len= 0;
+
   for (off_t x= begin; x < end; x++)
   {
     /* Unix (includes Mac OS X) */
     if (data_buff->get_value(x) == '\n')
-    {
       *eoln_len= 1;
-      return x;
-    }
-    if (data_buff->get_value(x) == '\r') // Mac or Dos
-    {
-      /* old Mac line ending */
-      if (x + 1 == end || (data_buff->get_value(x + 1) != '\n'))
-      {
-        *eoln_len= 1;
-        return x;
-      }
-      else // DOS style ending
+    else
+      if (data_buff->get_value(x) == '\r') // Mac or Dos
       {
-        *eoln_len= 2;
-        return x + 1;
+        /* old Mac line ending */
+        if (x + 1 == end || (data_buff->get_value(x + 1) != '\n'))
+          *eoln_len= 1;
+        else // DOS style ending
+          *eoln_len= 2;
       }
-    }
+
+    if (*eoln_len)  // end of line was found
+      return x;
   }
 
   return 0;