diff options
| author | unknown <monty@mysql.com> | 2004-06-02 00:09:14 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-02 00:09:14 +0300 |
| commit | 5bf17d04f556c370de6a3567efccbe35baf35d37 (patch) | |
| tree | 7c47751643d7b2719fbee614235acaf2653f1d2a /sql/set_var.cc | |
| parent | ce0d015384d65199c3e0f830aa4f49937285e12b (diff) | |
| parent | 1a36eff30c4f661081d0943e2c764a0c1807acaf (diff) | |
| download | mariadb-git-5bf17d04f556c370de6a3567efccbe35baf35d37.tar.gz | |
Merge with 4.0 to get fixes for netware
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/README:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysys/mf_wcomp.c:
Auto merged
mysys/mf_wfile.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
configure.in:
Get changes for netware
include/my_sys.h:
Use local file
innobase/include/os0file.h:
auto merge
innobase/os/os0file.c:
auto merge
sql/mysqld.cc:
auto merge
sql/sql_acl.cc:
indentation change
sql/sql_acl.h:
use local file
sql/sql_class.h:
auto merge
sql/sql_db.cc:
use local file
sql/sql_parse.cc:
use local file
sql/sql_select.cc:
Merge
sql/sql_show.cc:
use local file
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 1112a869515..517a3c65ab8 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -182,7 +182,7 @@ sys_var_key_cache_long sys_key_cache_age_threshold("key_cache_age_threshold", param_age_threshold)); sys_var_bool_ptr sys_local_infile("local_infile", &opt_local_infile); -sys_var_thd_bool sys_log_warnings("log_warnings", &SV::log_warnings); +sys_var_thd_ulong sys_log_warnings("log_warnings", &SV::log_warnings); sys_var_thd_ulong sys_long_query_time("long_query_time", &SV::long_query_time); sys_var_thd_bool sys_low_priority_updates("low_priority_updates", |