le1t0-deprec 2.1.6.013 → 2.1.6.014

data/CHANGELOG

@@ -1,6 +1,10 @@
 # deprec changelog
 
-= 2.1.6.012 (Jun 12, 2010)
+= 2.1.6.014 (Jun 12, 2010)
+
+* fixed setting client character set in mysql recipe
+
+= 2.1.6.013 (Jun 12, 2010)
 
 * added character set options in mysql recipe
 

data/lib/deprec/recipes/db/mysql.rb

@@ -13,6 +13,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       set :mysql_client_port, 3306
       set :mysql_client_socket, '/var/run/mysqld/mysqld.sock'
       
+      set :mysql_mysql_default_character_set, nil
       set :mysql_mysql_no_auto_rehash, false # faster start of mysql but no tab completion
       
       set :mysql_mysqld_safe_socket, '/var/run/mysqld/mysqld.sock'
@@ -50,10 +51,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       set :mysql_mysqld_default_character_set, nil
       set :mysql_mysqld_character_set_server, nil
       set :mysql_mysqld_collation_server, nil
-      set :mysql_mysqld_character_set_client, nil
-      set :mysql_mysqld_character_set_connection, nil
-      set :mysql_mysqld_character_set_results, nil
-      set :mysql_mysqld_collation_connection, nil
       set :mysql_mysqld_group_concat_max_len, nil
       set :mysql_mysqld_innodb_file_per_table, false
 

data/lib/deprec/templates/mysql/my.cnf.erb

@@ -3,6 +3,7 @@
 <% if mysql_client_socket %>socket = <%= mysql_client_socket %><% end %>
 
 [mysql]
+<% if mysql_mysql_default_character_set %>default-character-set = <%= mysql_mysql_default_character_set %><% end %>
 <% if mysql_mysql_no_auto_rehash %>no-auto-rehash<% end %>
 
 [mysqld_safe]
@@ -45,10 +46,6 @@
 <% if mysql_mysqld_default_character_set %>default-character-set = <%= mysql_mysqld_default_character_set %><% end %>
 <% if mysql_mysqld_character_set_server %>character-set-server = <%= mysql_mysqld_character_set_server %><% end %>
 <% if mysql_mysqld_collation_server %>collation-server = <%= mysql_mysqld_collation_server %><% end %>
-<% if mysql_mysqld_character_set_client %>character-set-client = <%= mysql_mysqld_character_set_client %><% end %>
-<% if mysql_mysqld_character_set_connection %>character-set-connection = <%= mysql_mysqld_character_set_connection %><% end %>
-<% if mysql_mysqld_character_set_results %>character-set-results = <%= mysql_mysqld_character_set_results %><% end %>
-<% if mysql_mysqld_collation_connection %>collation-connection = <%= mysql_mysqld_collation_connection %><% end %>
 <% if mysql_mysqld_group_concat_max_len %>group_concat_max_len = <%= mysql_mysqld_group_concat_max_len %><% end %>
 <% if mysql_mysqld_innodb_file_per_table %>innodb_file_per_table<% end %>
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 1
   - 6
-  - 13
-  version: 2.1.6.013
+  - 14
+  version: 2.1.6.014
 platform: ruby
 authors: 
 - Le1t0