Only try and query innodb status with MySQL databases

mperham · Jan 21, 2012 · 317b544 · 317b544
1 parent a2b55f7
commit 317b544
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/lib/deadlock_retry.rb b/lib/deadlock_retry.rb
@@ -71,17 +71,21 @@ def show_innodb_status
     def check_innodb_status_available
       return unless DeadlockRetry.innodb_status_cmd == nil
 
-      begin
+      if self.connection.adapter_name == "MySQL"
-        mysql_version = self.connection.select_rows('show variables like \'version\'')[0][1]
+        begin
-        cmd = if mysql_version < '5.5'
+          mysql_version = self.connection.select_rows('show variables like \'version\'')[0][1]
-          'show innodb status'
+          cmd = if mysql_version < '5.5'
-        else
+            'show innodb status'
-          'show engine innodb status'
+          else
+            'show engine innodb status'
+          end
+          self.connection.select_value(cmd)
+          DeadlockRetry.innodb_status_cmd = cmd
+        rescue
+          logger.info "Cannot log innodb status: #{$!.message}"
+          DeadlockRetry.innodb_status_cmd = false
         end
-        self.connection.select_value(cmd)
+      else
-        DeadlockRetry.innodb_status_cmd = cmd
-      rescue
-        logger.info "Cannot log innodb status: #{$!.message}"
         DeadlockRetry.innodb_status_cmd = false
       end
     end

diff --git a/test/deadlock_retry_test.rb b/test/deadlock_retry_test.rb
@@ -45,6 +45,10 @@ def self.select_value(sql)
     true
   end
 
+  def self.adapter_name
+    "MySQL"
+  end
+
   include DeadlockRetry
 end