Merge pull request #4337 from oliverbarnes/4312-index-key-too-long

Limit index key length when creating oembed caches

Conflicts:
	db/schema.rb

Changelog.md

@@ -25,6 +25,7 @@
 * Change image to ajax-loader when closing lightbox [#3229](https://github.com/diaspora/diaspora/issues/3229)
 * Fix pointer cursor on the file upload button [#4349](https://github.com/diaspora/diaspora/pull/4349)
 * Resize preview button [#4355](https://github.com/diaspora/diaspora/pull/4355)
+* Fix compability problem with MySQL 5.6 [#4312](https://github.com/diaspora/diaspora/issues/4312)
 
 ## Features
 * Admin: add option to find users under 13 (COPPA) [#4252](https://github.com/diaspora/diaspora/pull/4252)

db/migrate/20110924112840_create_o_embed_caches.rb

@@ -4,7 +4,7 @@ class CreateOEmbedCaches < ActiveRecord::Migration
       t.string :url, :limit => 1024, :null => false, :unique => true
       t.text :data, :null => false
     end
-    add_index :o_embed_caches, :url
+    add_index :o_embed_caches, :url, :length => { :url => 255 }
   end
 
   def self.down