Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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, 2007-02-20 14:24:01+01:00, msvensson@stripped +1 -0
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
MERGE: 1.1810.2372.113
client/mysqltest.c@stripped, 2007-02-20 14:23:58+01:00, msvensson@stripped +0 -0
Auto merged
MERGE: 1.155.32.9
# 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: msvensson
# Host: pilot.blaudden
# Root: /home/msvensson/mysql/mysql-5.1-new-maint/RESYNC
--- 1.275/client/mysqltest.c 2007-02-19 20:34:50 +01:00
+++ 1.276/client/mysqltest.c 2007-02-20 14:23:58 +01:00
@@ -2196,7 +2196,7 @@
{
int fd;
uint len;
- byte buff[512];
+ char buff[512];
static DYNAMIC_STRING ds_filename;
const struct command_arg cat_file_args[] = {
"filename", ARG_STRING, TRUE, &ds_filename, "File to read from"
@@ -2213,10 +2213,27 @@
if ((fd= my_open(ds_filename.str, O_RDONLY, MYF(0))) < 0)
die("Failed to open file %s", ds_filename.str);
- while((len= my_read(fd, &buff,
+ while((len= my_read(fd, (byte*)&buff,
sizeof(buff), MYF(0))) > 0)
{
- dynstr_append_mem(&ds_res, buff, len);
+ char *p= buff, *start= buff;
+ while (p < buff+len)
+ {
+ /* Convert cr/lf to lf */
+ if (*p == '\r' && *(p+1) && *(p+1)== '\n')
+ {
+ /* Add fake newline instead of cr and output the line */
+ *p= '\n';
+ p++; /* Step past the "fake" newline */
+ dynstr_append_mem(&ds_res, start, p-start);
+ p++; /* Step past the "fake" newline */
+ start= p;
+ }
+ else
+ p++;
+ }
+ /* Output any chars that migh be left */
+ dynstr_append_mem(&ds_res, start, p-start);
}
my_close(fd, MYF(0));
dynstr_free(&ds_filename);
Thread |
---|
• bk commit into 5.1 tree (msvensson:1.2452) | msvensson | 20 Feb |