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

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1

include/my_global.h

@@ -78,14 +78,6 @@
 #endif
 #endif /* _WIN32... */
 
-/* Remove some things in embedded library */
-#ifdef EMBEDDED_LIBRARY
-/* No partition handler in embedded library */
-#ifdef HAVE_PARTITION_DB
-#undef HAVE_PARTITION_DB
-#endif
-#endif
-
 /* Some defines to avoid ifdefs in the code */
 #ifndef NETWARE_YIELD
 #define NETWARE_YIELD

libmysqld/Makefile.am

@@ -63,7 +63,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
 	spatial.cc gstream.cc sql_help.cc tztime.cc protocol_cursor.cc \
 	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
 	parse_file.cc rpl_filter.cc sql_view.cc sql_trigger.cc my_decimal.cc \
-	ha_blackhole.cc
+	ha_blackhole.cc sql_partition.cc ha_partition.cc
 
 libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)
 libmysqld_a_SOURCES=