diff options
| author | unknown <serg@serg.mylan> | 2004-04-07 16:20:46 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-04-07 16:20:46 +0200 |
| commit | b6f2a534fe9cfa4b67afa2ea8ad8c65f043d6302 (patch) | |
| tree | 8e3d0724200afbcae1e7e7b321b2e166b4f4cd39 /sql/table.cc | |
| parent | 0948f9769b3e3da2e064e65015b86644af4acd78 (diff) | |
| parent | 736853e501181c33e692653d00d7a84c6ff68f25 (diff) | |
| download | mariadb-git-b6f2a534fe9cfa4b67afa2ea8ad8c65f043d6302.tar.gz | |
merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 23d99466a83..f137abf2ef7 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1228,7 +1228,7 @@ bool get_field(MEM_ROOT *mem, Field *field, String *res) String str(buff,sizeof(buff),&my_charset_bin); uint length; - field->val_str(&str,&str); + field->val_str(&str); if (!(length= str.length())) return 1; to= strmake_root(mem, str.ptr(), length); @@ -1256,7 +1256,7 @@ char *get_field(MEM_ROOT *mem, Field *field) String str(buff,sizeof(buff),&my_charset_bin); uint length; - field->val_str(&str,&str); + field->val_str(&str); length= str.length(); if (!length || !(to= (char*) alloc_root(mem,length+1))) return NullS; |