summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <paul@ice.snake.net>2004-03-08 15:07:49 -0600
committerunknown <paul@ice.snake.net>2004-03-08 15:07:49 -0600
commit53d4a5661b0ee2c4184f8d74cc0477bdb9ff4d2d (patch)
tree373e2f7a8a53a18aeac0c9810a00bffef8126889
parentfb26dee27f71ea992bf09c1dd8fff3fb9ef902e3 (diff)
downloadmariadb-git-53d4a5661b0ee2c4184f8d74cc0477bdb9ff4d2d.tar.gz
Reapply change after merge.
-rw-r--r--sql/set_var.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index beeaf517cfc..04fe2a8ea46 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -578,7 +578,7 @@ struct show_var_st init_vars[]= {
#endif
{sys_binlog_cache_size.name,(char*) &sys_binlog_cache_size, SHOW_SYS},
{sys_bulk_insert_buff_size.name,(char*) &sys_bulk_insert_buff_size,SHOW_SYS},
- {"character-sets-dir", mysql_charsets_dir, SHOW_CHAR},
+ {"character_sets_dir", mysql_charsets_dir, SHOW_CHAR},
{sys_character_set_client.name,(char*) &sys_character_set_client, SHOW_SYS},
{sys_character_set_connection.name,(char*) &sys_character_set_connection,SHOW_SYS},
{sys_character_set_database.name, (char*) &sys_character_set_database,SHOW_SYS},