1 files changed, 3 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 59137fb842..251acf1c83 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -482,16 +482,11 @@ module ActiveRecord
         show_variable 'collation_database'
       end
 
-      def tables(name = nil, database = nil, like = nil) #:nodoc:
-        database ||= current_database
-
+      def tables(name = nil) # :nodoc:
         sql = "SELECT table_name FROM information_schema.tables "
-        sql << "WHERE table_schema = #{quote(database)}"
-        sql << " AND table_name = #{quote(like)}" if like
+        sql << "WHERE table_schema = #{quote(@config[:database])}"
 
-        execute_and_free(sql, 'SCHEMA') do |result|
-          result.collect(&:first)
-        end
+        select_values(sql, 'SCHEMA')
       end
       alias data_sources tables