summaryrefslogtreecommitdiff
path: root/sql/item_strfunc.h
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2000-11-06 19:39:13 -0700
committersasha@mysql.sashanet.com <>2000-11-06 19:39:13 -0700
commit2b05ed9d026925ea6dcac9ff16b8efb7ea94f473 (patch)
treef165c573e30544964d89e3a5e99c270fef4686b1 /sql/item_strfunc.h
parentfddab55df3f6455c6a91f5c9300d58ef34d3165e (diff)
downloadmariadb-git-2b05ed9d026925ea6dcac9ff16b8efb7ea94f473.tar.gz
sql/item_strfunc.cc
fixed coredump in concat_ws sql/item_strfunc.h fixed coredump in concat_ws sql/mini_client.cc added mc_mysql_error() sql/mini_client.h added mc_mysql_errno() sql/mysqlbinlog.cc fixed bug in --postion for local files sql/slave.cc more verbose message on bad net reads sql/sql_repl.cc send errno on error in mysql_binlog_send
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r--sql/item_strfunc.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index 97bc1063db3..1b829b19439 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -69,7 +69,13 @@ public:
~Item_func_concat_ws() { delete separator; }
String *val_str(String *);
void fix_length_and_dec();
- const char *func_name() const { return "concat_ws"; }
+ void update_used_tables();
+ bool fix_fields(THD *thd,struct st_table_list *tlist)
+ {
+ return (separator->fix_fields(thd,tlist)
+ || Item_func::fix_fields(thd,tlist));
+ }
+ const char *func_name() const { return "concat_ws"; }
};
class Item_func_reverse :public Item_str_func