Commit b90e575d authored by petr@mysql.com's avatar petr@mysql.com

fix test failure in the team tree

parent 8638f1cc
...@@ -503,28 +503,25 @@ int tina_end(ha_panic_function type) ...@@ -503,28 +503,25 @@ int tina_end(ha_panic_function type)
off_t find_eoln_buff(Transparent_file *data_buff, off_t begin, off_t find_eoln_buff(Transparent_file *data_buff, off_t begin,
off_t end, int *eoln_len) off_t end, int *eoln_len)
{ {
*eoln_len= 0;
for (off_t x= begin; x < end; x++) for (off_t x= begin; x < end; x++)
{ {
/* Unix (includes Mac OS X) */ /* Unix (includes Mac OS X) */
if (data_buff->get_value(x) == '\n') if (data_buff->get_value(x) == '\n')
{
*eoln_len= 1; *eoln_len= 1;
return x; else
} if (data_buff->get_value(x) == '\r') // Mac or Dos
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
{ {
*eoln_len= 2; /* old Mac line ending */
return x + 1; 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; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment