summaryrefslogtreecommitdiff
path: root/sql/set_var.h
diff options
context:
space:
mode:
authorunknown <serg@janus.mylan>2007-04-13 19:23:02 +0200
committerunknown <serg@janus.mylan>2007-04-13 19:23:02 +0200
commitbf2aaad97d0ff65a4a79f9012b4443d4d6dbd6e8 (patch)
treec318326d7c94a04b34753308fce3a0bb1b38f53e /sql/set_var.h
parent1e6bd48ccbd725c298453cf6c7645b430529fe43 (diff)
downloadmariadb-git-bf2aaad97d0ff65a4a79f9012b4443d4d6dbd6e8.tar.gz
wl#2936 - fixing problems
include/mysql/plugin.h: warning. no int/realsize mysys/my_getopt.c: combination of prefixes (e.g. --loose-skip-) didn't work sql/event_queue.cc: warning sql/handler.cc: assert sql/handler.h: comment sql/item_create.cc: warnings sql/log.cc: warnings sql/mysqld.cc: wl#2936 - fixing problems (memory leak in load_defaults, garbage in opt_[slow_]logname sql/partition_element.h: warnings sql/rpl_utility.h: warnings sql/set_var.cc: comment sql/set_var.h: warnings sql/sql_class.cc: warnings sql/sql_parse.cc: warnings sql/sql_plugin.cc: wl#2936 - fixing problems: portability, coding style, reporting of spurious errors, crashes, incorrect help output storage/example/ha_example.cc: comment storage/innobase/handler/ha_innodb.cc: wl#2936 - fixing problems (crash)
Diffstat (limited to 'sql/set_var.h')
-rw-r--r--sql/set_var.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/set_var.h b/sql/set_var.h
index 2813a756b8e..dedd0d35716 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -641,12 +641,12 @@ public:
class sys_var_character_set_sv :public sys_var_character_set
{
- CHARSET_INFO **global_default;
CHARSET_INFO *SV::*offset;
+ CHARSET_INFO **global_default;
public:
sys_var_character_set_sv(sys_var_chain *chain, const char *name_arg,
CHARSET_INFO *SV::*offset_arg,
- CHARSET_INFO **global_default_arg,
+ CHARSET_INFO **global_default_arg,
bool is_nullable= 0)
: sys_var_character_set(name_arg, is_nullable),
offset(offset_arg), global_default(global_default_arg)
@@ -668,8 +668,8 @@ public:
class sys_var_collation_sv :public sys_var_collation
{
- CHARSET_INFO **global_default;
CHARSET_INFO *SV::*offset;
+ CHARSET_INFO **global_default;
public:
sys_var_collation_sv(sys_var_chain *chain, const char *name_arg,
CHARSET_INFO *SV::*offset_arg,