Permalink
Browse files

The app generator detects the XAMPP package's MySQL socket location. C…

…loses #3832.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4336 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 491b4a3 commit a61c1825ab84bcef34e9bba0f21b2b4c650373bb @jeremy jeremy committed May 12, 2006
View
@@ -1,5 +1,7 @@
*SVN*
+* The app generator detects the XAMPP package's MySQL socket location. #3832 [elliot@townx.org]
+
* The app generator sets a session key in application.rb so apps running on the same host may distinguish their cookies. #2967 [rcoder, rails-bug@owl.me.uk]
* Distinguish the spawners for different processes [DHH]
@@ -154,6 +154,7 @@ def mysql_socket_location
"/opt/local/lib/mysql/mysql.sock", # fedora
"/opt/local/var/run/mysqld/mysqld.sock", # mac + darwinports + mysql
"/opt/local/var/run/mysql4/mysqld.sock", # mac + darwinports + mysql4
- "/opt/local/var/run/mysql5/mysqld.sock" # mac + darwinports + mysql5
+ "/opt/local/var/run/mysql5/mysqld.sock", # mac + darwinports + mysql5
+ "/opt/lampp/var/mysql/mysql.sock" # xampp for linux
]
end

0 comments on commit a61c182

Please sign in to comment.