Merge changes from trunk 7673:8632.

[rails.git] / db / README

diff --git a/db/README b/db/README
index e3e210a43c440b4e90e7d188e92c7475bb7984c4..447c63651f538952278eb69e10afb7dcbce6ffc3 100644 (file)
--- a/db/README
+++ b/db/README
@@ -7,10 +7,13 @@ openstreetmap
 
 You may create it with your preferable client or run next (linux) command:
 
-$ mysqladmin -u <uid> -p create openstreetmap
+$ mysql -u <uid> -p
 
 (change <uid> with appropriate username of administrative user eg. root )
 
+> create database openstreetmap default character set utf8;
+> exit
+
 Creating user, password, and access rights
 ============================================
 
@@ -22,10 +25,34 @@ $ mysql -u <uid> -p
 > flush privileges;
 > exit
 
+Creating functions
+====================
+
+Run this command in the db/functions directory:
+
+$ make
+
+Make sure the db/functions directory is on the MySQL server's library
+path and restart the MySQL server. 
+
+On Linux the easiest way to do this is to create /etc/ld.so.conf.d/osm.conf, and place the path to the db/functions directory in it and then run the ldconfig command as root.
+
+On OS X: sudo ln -s /path_to_your_osm_install/sites/rails_port/db/functions/libmyosm.so /usr/local/lib/libmyosm.so
+
+Now create the functions as follows:
+
+$ mysql -u <uid> -p openstreetmap
+
+(change <uid> with appropriate username of administrative user eg. root )
+
+> create function tile_for_point returns integer soname 'libmyosm.so';
+> create function maptile_for_point returns integer soname 'libmyosm.so';
+> exit
+
 Creating database skeleton tables
 ===================================
 
-Run this command from the root of your rails direcotry:
+Run this command from the root of your rails directory:
 
 $ rake db:migrate