Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  zim.(none):/home/brian/mysql/slap-5.1

client/Makefile.am

@@ -52,7 +52,9 @@ mysqltestmanager_pwgen_SOURCES =   mysqlmanager-pwgen.c
 mysqltestmanagerc_SOURCES=      mysqlmanagerc.c $(yassl_dummy_link_fix)
 mysqlcheck_SOURCES=             mysqlcheck.c $(yassl_dummy_link_fix)
 mysqlshow_SOURCES=              mysqlshow.c $(yassl_dummy_link_fix)
-mysqlslap_SOURCES=              mysqlslap.c $(yassl_dummy_link_fix)
+mysqlslap_SOURCES=              mysqlslap.c $(top_srcdir)/mysys/my_lock.c \
+				$(top_srcdir)/mysys/my_alarm.c \
+  				$(yassl_dummy_link_fix)
 mysqldump_SOURCES=              mysqldump.c $(yassl_dummy_link_fix)
 mysqlimport_SOURCES=            mysqlimport.c $(yassl_dummy_link_fix)
 sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

client/client_priv.h

@@ -51,6 +51,9 @@ enum options_client
 #endif
   OPT_TRIGGERS,
   OPT_MYSQL_ONLY_PRINT,
+  OPT_MYSQL_LOCK_DIRECTORY,
+  OPT_MYSQL_SLAP_SLAVE,
+  OPT_MYSQL_NUMBER_OF_QUERY, OPT_MYSQL_NUMBER_OF_ROWS,
   OPT_MYSQL_REPEAT_DATA, OPT_MYSQL_REPEAT_QUERY,
   OPT_MYSQL_PRESERVE_SCHEMA_ENTER, OPT_MYSQL_PRESERVE_SCHEMA_EXIT,
   OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,