diff options
| author | unknown <serg@serg.mylan> | 2005-02-18 12:02:46 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-02-18 12:02:46 +0100 |
| commit | 61a88ff0a1dd22df722fa5246075b8d354c683f8 (patch) | |
| tree | edca9fef9150201c6434455e186b727517e7d896 /sql/set_var.h | |
| parent | c2e18c5061e24fcafed4bb4f58ef41b6b0a52fcc (diff) | |
| parent | e31ffa246fa01610c7bb1f9629d95d3cb5283c81 (diff) | |
| download | mariadb-git-61a88ff0a1dd22df722fa5246075b8d354c683f8.tar.gz | |
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
configure.in:
Auto merged
mysql-test/r/drop_temp_table.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 19cf63871ef..d78c228c142 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -779,7 +779,7 @@ public: } save_result; LEX_STRING base; /* for structs */ - set_var(enum_var_type type_arg, sys_var *var_arg, LEX_STRING *base_name_arg, + set_var(enum_var_type type_arg, sys_var *var_arg, const LEX_STRING *base_name_arg, Item *value_arg) :var(var_arg), type(type_arg), base(*base_name_arg) { |