1 files changed, 17 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index 98a8dd6453..42eeacc173 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -410,12 +410,27 @@ module ActiveRecord
         show_variable 'collation_database'
       end
 
-      def tables(name = nil)
-        execute("SHOW TABLES", 'SCHEMA').collect do |field|
+      def tables(name = nil, database = nil) #:nodoc:
+        sql = ["SHOW TABLES", database].compact.join(' IN ')
+        execute(sql, 'SCHEMA').collect do |field|
           field.first
         end
       end
 
+      def table_exists?(name)
+        return true if super
+
+        name          = name.to_s
+        schema, table = name.split('.', 2)
+
+        unless table # A table was provided without a schema
+          table  = schema
+          schema = nil
+        end
+
+        tables(nil, schema).include? table
+      end
+
       def drop_table(table_name, options = {})
         super(table_name, options)
       end