summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-05-05 21:24:21 +0300
committerunknown <monty@mysql.com>2004-05-05 21:24:21 +0300
commit000f76cfb844eeda1c1c0092d4ab97f3f3acb6cb (patch)
tree7237dcd91649e057a85eb3caca141f3df5892db8 /sql/item.cc
parentcd21f7ce40ac4c7d415544a5b2aa07b1278419ac (diff)
downloadmariadb-git-000f76cfb844eeda1c1c0092d4ab97f3f3acb6cb.tar.gz
after merge fixes
client/mysqldump.c: Fixed problem with multiple tables (--skip-quote didn't work properly for second table) myisam/myisamchk.c: after merge fix
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 98e6f02efad..f1569b6dca6 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1355,7 +1355,7 @@ int Item::save_in_field(Field *field, bool no_conversions)
result=val_str(&str_value);
if (null_value)
{
- str_value.set_quick(0, 0);
+ str_value.set_quick(0, 0, cs);
return set_field_to_null_with_conversions(field, no_conversions);
}
field->set_notnull();