diff options
author | unknown <hf@deer.mysql.r18.ru> | 2003-01-20 18:47:25 +0400 |
---|---|---|
committer | unknown <hf@deer.mysql.r18.ru> | 2003-01-20 18:47:25 +0400 |
commit | f9dff9748e65288aa1c420f52452e61a5aef0594 (patch) | |
tree | 63d38e511b0b14f39e8fefc5eab11abc8e583d5d /sql/field.cc | |
parent | 150a238f033c3e3f8d67dfaa7d1616237738c1cb (diff) | |
download | mariadb-git-f9dff9748e65288aa1c420f52452e61a5aef0594.tar.gz |
SCRUM
embedded-related changes
include/mysql_com.h:
net_flush emptification
libmysqld/lib_sql.cc:
Some Protocol:: methods implemented
sql/convert.cc:
changes to use convert in embedded library
sql/field.cc:
set_key_image changed
sql/item.cc:
obsolete functions removed
sql/item.h:
embedded-related changes in Protocol class
sql/log.cc:
there's no ports in embedded library
sql/mysqld.cc:
some debug stuff
sql/protocol.cc:
embedded-related changes
sql/protocol.h:
embedded-related changes
sql/sql_cache.cc:
comment added
sql/sql_class.cc:
no need to do special embedded select_send::send_row
sql/sql_class.h:
embedded-related changes
sql/sql_parse.cc:
comments added debugging stuff deleted
sql/sql_show.cc:
non-protocol sending removed
Diffstat (limited to 'sql/field.cc')
-rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index dfc41f37205..edb9cf43fab 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4589,7 +4589,7 @@ void Field_geom::get_key_image(char *buff,uint length,CHARSET_INFO *cs, imagetyp void Field_geom::set_key_image(char *buff,uint length,CHARSET_INFO *cs) { - Field_blob::set_key_image(buff, length); + Field_blob::set_key_image(buff, length, cs); } void Field_geom::sql_type(String &res) const |