diff options
| author | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-07-19 13:09:11 -0400 |
|---|---|---|
| committer | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-07-19 13:09:11 -0400 |
| commit | 73f47590aa6a4f1a8866cea33f06ea12fc4ddc7f (patch) | |
| tree | 0d0ad4fb792f69470228b539f6c07b4811aaecf7 /sql/set_var.cc | |
| parent | 3c2bdb59bc19a62f08e9b778649d9f12a9c87eab (diff) | |
| parent | 471b1514f76aa88b9c856f1fcfbd71ec4c9e2643 (diff) | |
| download | mariadb-git-73f47590aa6a4f1a8866cea33f06ea12fc4ddc7f.tar.gz | |
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_bug16180
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index c9cada7158a..f42662b1f09 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -424,7 +424,8 @@ static sys_var_thd_bit sys_sql_big_tables("sql_big_tables", 0, static sys_var_thd_bit sys_big_selects("sql_big_selects", 0, set_option_bit, OPTION_BIG_SELECTS); -static sys_var_thd_bit sys_log_off("sql_log_off", 0, +static sys_var_thd_bit sys_log_off("sql_log_off", + check_log_update, set_option_bit, OPTION_LOG_OFF); static sys_var_thd_bit sys_log_update("sql_log_update", |