summaryrefslogtreecommitdiff
path: root/sql/parse_file.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2004-05-25 18:57:30 +0300
committerunknown <bell@sanja.is.com.ua>2004-05-25 18:57:30 +0300
commit4c09584bbf5947beaed33c8b964cd18c41049e49 (patch)
tree47f5c6be3fa55c5fe53bd77d55fb44f868b76079 /sql/parse_file.cc
parentbed3bc480ab0ee0cd989b1da34936911a459f589 (diff)
downloadmariadb-git-4c09584bbf5947beaed33c8b964cd18c41049e49.tar.gz
my_b_write() needs to be replaced with my_b_append() for a SEQ_READ_APPEND
Diffstat (limited to 'sql/parse_file.cc')
-rw-r--r--sql/parse_file.cc40
1 files changed, 20 insertions, 20 deletions
diff --git a/sql/parse_file.cc b/sql/parse_file.cc
index bdf8b6134ec..c2fd69e0767 100644
--- a/sql/parse_file.cc
+++ b/sql/parse_file.cc
@@ -50,27 +50,27 @@ write_escaped_string(IO_CACHE *file, LEX_STRING *val_s)
*/
switch(*ptr) {
case '\\': // escape character
- if (my_b_write(file, "\\\\", 2))
+ if (my_b_append(file, "\\\\", 2))
return TRUE;
break;
case '\n': // parameter value delimiter
- if (my_b_write(file, "\\n", 2))
+ if (my_b_append(file, "\\n", 2))
return TRUE;
break;
case '\0': // problem for some string processing utilites
- if (my_b_write(file, "\\0", 2))
+ if (my_b_append(file, "\\0", 2))
return TRUE;
break;
case 26: // problem for windows utilites (Ctrl-Z)
- if (my_b_write(file, "\\z", 2))
+ if (my_b_append(file, "\\z", 2))
return TRUE;
break;
case '\'': // list of string delimiter
- if (my_b_write(file, "\\\'", 2))
+ if (my_b_append(file, "\\\'", 2))
return TRUE;
break;
default:
- if (my_b_write(file, ptr, 1))
+ if (my_b_append(file, ptr, 1))
return TRUE;
}
}
@@ -106,7 +106,7 @@ write_parameter(IO_CACHE *file, gptr base, File_option *parameter,
case FILE_OPTIONS_STRING:
{
LEX_STRING *val_s= (LEX_STRING *)(base + parameter->offset);
- if (my_b_write(file, val_s->str, val_s->length))
+ if (my_b_append(file, val_s->str, val_s->length))
DBUG_RETURN(TRUE);
break;
}
@@ -119,7 +119,7 @@ write_parameter(IO_CACHE *file, gptr base, File_option *parameter,
case FILE_OPTIONS_ULONGLONG:
{
num.set(*((ulonglong *)(base + parameter->offset)), &my_charset_bin);
- if (my_b_write(file, num.ptr(), num.length()))
+ if (my_b_append(file, num.ptr(), num.length()))
DBUG_RETURN(TRUE);
break;
}
@@ -128,7 +128,7 @@ write_parameter(IO_CACHE *file, gptr base, File_option *parameter,
ulonglong *val_i= (ulonglong *)(base + parameter->offset);
*old_version= (*val_i)++;
num.set(*val_i, &my_charset_bin);
- if (my_b_write(file, num.ptr(), num.length()))
+ if (my_b_append(file, num.ptr(), num.length()))
DBUG_RETURN(TRUE);
break;
}
@@ -141,7 +141,7 @@ write_parameter(IO_CACHE *file, gptr base, File_option *parameter,
get_date(val_s->str, GETDATE_DATE_TIME|GETDATE_GMT|GETDATE_FIXEDLENGTH,
tm);
val_s->length= PARSE_FILE_TIMESTAMPLENGTH;
- if (my_b_write(file, val_s->str, PARSE_FILE_TIMESTAMPLENGTH))
+ if (my_b_append(file, val_s->str, PARSE_FILE_TIMESTAMPLENGTH))
DBUG_RETURN(TRUE);
break;
}
@@ -155,10 +155,10 @@ write_parameter(IO_CACHE *file, gptr base, File_option *parameter,
{
num.set((ulonglong)str->length, &my_charset_bin);
// ',' after string to detect list continuation
- if ((!first && my_b_write(file, " ", 1)) ||
- my_b_write(file, "\'", 1) ||
- my_b_write(file, str->str, str->length) ||
- my_b_write(file, "\'", 1))
+ if ((!first && my_b_append(file, " ", 1)) ||
+ my_b_append(file, "\'", 1) ||
+ my_b_append(file, str->str, str->length) ||
+ my_b_append(file, "\'", 1))
{
DBUG_RETURN(TRUE);
}
@@ -222,18 +222,18 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
goto err_w_file;
// write header (file signature)
- if (my_b_write(&file, "TYPE=", 5) ||
- my_b_write(&file, type->str, type->length) ||
- my_b_write(&file, "\n", 1))
+ if (my_b_append(&file, "TYPE=", 5) ||
+ my_b_append(&file, type->str, type->length) ||
+ my_b_append(&file, "\n", 1))
goto err_w_file;
// write parameters to temporary file
for (File_option *param= parameters; param->name.str; param++)
{
- if (my_b_write(&file, param->name.str, param->name.length) ||
- my_b_write(&file, "=", 1) ||
+ if (my_b_append(&file, param->name.str, param->name.length) ||
+ my_b_append(&file, "=", 1) ||
write_parameter(&file, base, param, &old_version) ||
- my_b_write(&file, "\n", 1))
+ my_b_append(&file, "\n", 1))
goto err_w_cache;
}