diff options
| author | unknown <jimw@mysql.com> | 2006-04-26 11:34:45 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2006-04-26 11:34:45 -0700 |
| commit | b9d4ed890d9f0c178d21c9d8084209c3b2ffb4bb (patch) | |
| tree | 77ea99fc16af04d62e8c80f05dc6d16862d75c1c /sql/set_var.cc | |
| parent | 9ad62af44dd9e9a5fe321de48fbf0f1dd0694893 (diff) | |
| parent | 9cdc23bcb4a0a49e3f3f6fe7ef0a3bfbfe38afaf (diff) | |
| download | mariadb-git-b9d4ed890d9f0c178d21c9d8084209c3b2ffb4bb.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-16195
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/set_var.cc:
Auto merged
mysql-test/r/variables.result:
Resolve conflict
mysql-test/t/variables.test:
Resolve conflict
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 4e8575f3df2..db959cbcfa3 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -996,8 +996,8 @@ struct show_var_st init_vars[]= { {sys_sort_buffer.name, (char*) &sys_sort_buffer, SHOW_SYS}, {sys_big_selects.name, (char*) &sys_big_selects, SHOW_SYS}, {sys_sql_mode.name, (char*) &sys_sql_mode, SHOW_SYS}, - {"sql_notes", (char*) &sys_sql_notes, SHOW_BOOL}, - {"sql_warnings", (char*) &sys_sql_warnings, SHOW_BOOL}, + {"sql_notes", (char*) &sys_sql_notes, SHOW_SYS}, + {"sql_warnings", (char*) &sys_sql_warnings, SHOW_SYS}, {sys_storage_engine.name, (char*) &sys_storage_engine, SHOW_SYS}, #ifdef HAVE_REPLICATION {sys_sync_binlog_period.name,(char*) &sys_sync_binlog_period, SHOW_SYS}, |