bzr commit into mysql-5.1-telco-7.2 branch (john.duncan:4153)

[John David Duncan]

#At file:///Users/jdd/bzr-repo/working/5.1-telco-7.2-memcache/ based on revid:john.duncan@stripped

 4153 John David Duncan	2011-04-05
      Revisions to README file.

    modified:
      storage/ndb/memcache/README
      storage/ndb/memcache/src/schedulers/Flex_cluster.cc
=== modified file 'storage/ndb/memcache/README'
--- a/storage/ndb/memcache/README	2011-04-06 04:31:28 +0000
+++ b/storage/ndb/memcache/README	2011-04-06 05:45:04 +0000
@@ -17,61 +17,78 @@ keys go directly to the database without
 QUICK START
 
 
-OBTAIN MEMCACHED
---------------------------
+# OBTAIN MEMCACHED
+# --------------------------
 # Obtain memcached 1.6 source from github, and then checkout the 
 # "engine-pu" branch which contains the "storage engine API" code
+#
 git clone git://github.com/memcached/memcached
 cd memcached
+MEMCACHED_SRC_DIR=`pwd`
 git checkout -t origin/engine-pu 
 
 
-DECIDE WHERE MEMCACHED WILL BE INSTALLED
---------------------------
+# DECIDE WHERE MEMCACHED WILL BE INSTALLED
+# --------------------------
 # You will have to configure memcached and the NDB engine separately, but
-# it is important 
+# it is important to install them in the same place
+#
+INSTALL_PREFIX=/usr/local/mysql-memcache
 
-BUILD AND INSTALL MEMCACHED
---------------------------
-Note that memcached requires libevent 1.3 or newer.
+
+# BUILD AND INSTALL MEMCACHED
+# --------------------------
+# Note that memcached requires libevent 1.3 or newer.
+#
 sh config/autorun.sh 
-./configure --prefix=INSTALL_LOCATION 
+./configure --prefix=$INSTALL_PREFIX 
 make
-make install
+sudo make install
 
 
-BUILD AND INSTALL MYSQL CLUSTER
---------------------------
-Use the same install location as before.
-cd TOP_MYSQL_SOURCE_DIRECTORY
-./configure --with-plugins=ndbcluster --prefix=INSTALL_LOCATION
+# BUILD AND INSTALL MYSQL CLUSTER
+# --------------------------
+# cd into the top mysql source directory, and build and install mysql cluster 7.2
+# 
+sh BUILD/autorun.sh
+./configure --with-plugins=ndbcluster --prefix=$INSTALL_PREFIX
 make 
-make install 
+sudo make install 
 
 
-BUILD AND INSTALL THE NDB ENGINE FOR MEMCACHED
---------------------------
-Use the same install location as before.
+# BUILD AND INSTALL THE NDB ENGINE FOR MEMCACHED
+# --------------------------
+# Use the same install location as before.
 cd storage/ndb/memcache
 sh autorun.sh
-./configure --prefix=INSTALL_LOCATION
+./configure \
+  --prefix=$INSTALL_PREFIX \
+  --with-memcached-src=$MEMCACHED_SRC_DIR \
+  --enable-debug
 make
-make install
+sudo make install
 
 
-CREATE THE DATABASE OBJECTS
---------------------------
+# START MYSQL CLUSTER
+# --------------------------
+# (Unfortunately this part does not work yet:) 
+make start-sandbox
+
+
+# CREATE THE DATABASE OBJECTS
+# --------------------------
 mysql -u root < scripts/metadata.sql 
 
 
-START THE SERVER
---------------------------
-cd INSTALL_LOCATION
+# START THE SERVER
+# --------------------------
+# The "-E" option names a storage engine, and "-e" is for engine-specific  
+# options.  You could also start a standard memcached server, like this: 
+# bin/memcached -E lib/memcached/default_engine.so 
+
+cd $INSTALL_PREFIX
 bin/memcached -E lib/ndb_engine.so -e "connectstring=localhost:1186;role=db-only"
 
-The "-E" option names a storage engine, and "-e" is for engine-specific options.  
-Note that you could also start a standard memcached server, like this: 
-bin/memcached -E lib/memcached/default_engine.so 
 
 
 RUN SOME CLIENT COMMANDS 

=== modified file 'storage/ndb/memcache/src/schedulers/Flex_cluster.cc'
--- a/storage/ndb/memcache/src/schedulers/Flex_cluster.cc	2011-04-06 04:33:57 +0000
+++ b/storage/ndb/memcache/src/schedulers/Flex_cluster.cc	2011-04-06 05:45:04 +0000
@@ -130,7 +130,7 @@ void Scheduler_flex::Cluster::attach_thr
   /* Start the commit threads */
   for(int t = 0 ; t < sched->config.n_commit_threads ; t++) {
     thread_spec * spec = new thread_spec(sched, parent, broker_id, id, t);
-    pthread_create(& commit_thread_ids[t], & commit_thd_attr,
+    pthread_create(& commit_thread_ids[t], NULL, 
                    run_flex_commit_thread, (void *) spec);
   }
 }


Attachment: [text/bzr-bundle] bzr/[e-mail]