Fixed enable_cleartext_plugin mode (#874)

brianmario · Aug 8, 2017 · a321723 · a321723
1 parent 7e8f0e1
commit a321723
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/ext/mysql2/client.c b/ext/mysql2/client.c
@@ -903,7 +903,7 @@ static VALUE _mysql_client_options(VALUE self, int opt, VALUE value) {
       retval  = charval;
       break;
 
-#ifdef MYSQL_ENABLE_CLEARTEXT_PLUGIN
+#ifdef HAVE_CONST_MYSQL_ENABLE_CLEARTEXT_PLUGIN
     case MYSQL_ENABLE_CLEARTEXT_PLUGIN:
       boolval = (value == Qfalse ? 0 : 1);
       retval = &boolval;
@@ -1328,7 +1328,7 @@ static VALUE set_init_command(VALUE self, VALUE value) {
 }
 
 static VALUE set_enable_cleartext_plugin(VALUE self, VALUE value) {
-#ifdef MYSQL_ENABLE_CLEARTEXT_PLUGIN
+#ifdef HAVE_CONST_MYSQL_ENABLE_CLEARTEXT_PLUGIN
   return _mysql_client_options(self, MYSQL_ENABLE_CLEARTEXT_PLUGIN, value);
 #else
   rb_raise(cMysql2Error, "enable-cleartext-plugin is not available, you may need a newer MySQL client library");

diff --git a/ext/mysql2/extconf.rb b/ext/mysql2/extconf.rb
@@ -114,6 +114,7 @@ def add_ssl_defines(header)
 add_ssl_defines(mysql_h)
 have_struct_member('MYSQL', 'net.vio', mysql_h)
 have_struct_member('MYSQL', 'net.pvio', mysql_h)
+have_const('MYSQL_ENABLE_CLEARTEXT_PLUGIN', mysql_h)
 
 # This is our wishlist. We use whichever flags work on the host.
 # -Wall and -Wextra are included by default.

diff --git a/spec/mysql2/client_spec.rb b/spec/mysql2/client_spec.rb
@@ -1026,6 +1026,11 @@ def run_gc
     expect(@client.ping).to eql(false)
   end
 
+  it "should be able to connect using plaintext password" do
+    client = new_client(:enable_cleartext_plugin => true)
+    client.query('SELECT 1')
+  end
+
   unless RUBY_VERSION =~ /1.8/
     it "should respond to #encoding" do
       expect(@client).to respond_to(:encoding)